dllexport solv_version as well

openSUSE · Apr 25, 2020 · a5b7e68 · a5b7e68
1 parent a066859
commit a5b7e68
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/src/solvversion.c b/src/solvversion.c
@@ -7,7 +7,7 @@
 
 #include "solvversion.h"
 
-const char solv_version[] = LIBSOLV_VERSION_STRING;
-int solv_version_major = LIBSOLV_VERSION_MAJOR;
-int solv_version_minor = LIBSOLV_VERSION_MINOR;
-int solv_version_patch = LIBSOLV_VERSION_PATCH;
+SOLV_API const char solv_version[] = LIBSOLV_VERSION_STRING;
+SOLV_API int solv_version_major = LIBSOLV_VERSION_MAJOR;
+SOLV_API int solv_version_minor = LIBSOLV_VERSION_MINOR;
+SOLV_API int solv_version_patch = LIBSOLV_VERSION_PATCH;
diff --git a/src/solvversion.h.in b/src/solvversion.h.in
@@ -19,10 +19,17 @@
 #define LIBSOLV_VERSION_PATCH @LIBSOLV_PATCH@
 #define LIBSOLV_VERSION (LIBSOLV_VERSION_MAJOR * 10000 + LIBSOLV_VERSION_MINOR * 100 + LIBSOLV_VERSION_PATCH)
 
-extern const char solv_version[];
-extern int solv_version_major;
-extern int solv_version_minor;
-extern int solv_version_patch;
+#ifdef _WIN32
+// include win32/config.h for SOLV_API 
+#include "win32_config.h"
+#else
+#define SOLV_API
+#endif
+
+SOLV_API extern const char solv_version[];
+SOLV_API extern int solv_version_major;
+SOLV_API extern int solv_version_minor;
+SOLV_API extern int solv_version_patch;
 
 #cmakedefine LIBSOLV_FEATURE_LINKED_PKGS
 #cmakedefine LIBSOLV_FEATURE_COMPLEX_DEPS

diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt
@@ -1,9 +1,12 @@
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/win32)
+
 SET (WIN32_COMPAT_SOURCES
   ${PROJECT_SOURCE_DIR}/win32/fnmatch.c
   ${PROJECT_SOURCE_DIR}/win32/getopt.c
   ${PROJECT_SOURCE_DIR}/win32/regcomp.c
   ${PROJECT_SOURCE_DIR}/win32/regexec.c
   ${PROJECT_SOURCE_DIR}/win32/strfncs.c
   ${PROJECT_SOURCE_DIR}/win32/tre-mem.c
-)
+)
+
+INSTALL (FILES ${PROJECT_SOURCE_DIR}/win32/win32_config.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv")
diff --git a/win32/config.h b/win32/config.h
diff --git a/win32/getopt.c b/win32/getopt.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "config.h"
+#include "win32_config.h"
 
 SOLV_API char *optarg;
 SOLV_API int optind=1, opterr=1, optopt, __optpos, __optreset=0;

diff --git a/win32/getopt.h b/win32/getopt.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "config.h"
+#include "win32_config.h"
 
 int getopt(int, char * const [], const char *);