windows build fix (zerotier#263)

AlexIndustrial · Feb 2, 2024 · c16f1b4 · c16f1b4
1 parent 7fa5968
commit c16f1b4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,6 +92,7 @@ include_directories(${ZTO_SRC_DIR}/osdep)
 include_directories(${ZTO_SRC_DIR}/ext/libnatpmp)
 include_directories(${ZTO_SRC_DIR}/ext/prometheus-cpp-lite-1.0/core/include)
 include_directories(${ZTO_SRC_DIR}/ext/prometheus-cpp-lite-1.0/simpleapi/include)
+include_directories(${ZTO_SRC_DIR}/ext/)
 # libzt
 include_directories(${PROJ_DIR}/src)
 include_directories(${PROJ_DIR}/include)

diff --git a/include/ZeroTierSockets.h b/include/ZeroTierSockets.h
@@ -197,7 +197,7 @@ typedef enum {
 /**
  * Error variable set after each `zts_*` socket call. Provides additional error context.
  */
-extern int zts_errno;
+extern ZTS_API int zts_errno;
 
 typedef enum {
     /** Operation not permitted */
@@ -1011,15 +1011,19 @@ typedef struct {
 //----------------------------------------------------------------------------//
 
 #if defined(_WIN32)
-#ifdef ADD_EXPORTS
-#define ZTS_API __declspec(dllexport)
+    #ifndef ZTS_STATIC
+        #ifdef ADD_EXPORTS
+            #define ZTS_API __declspec(dllexport)
+        #else
+            #define ZTS_API __declspec(dllimport)
+        #endif
+    #else
+        #define ZTS_API
+    #endif
+ 	#define ZTCALL __cdecl
 #else
-#define ZTS_API __declspec(dllimport)
-#endif
-#define ZTCALL __cdecl
-#else
-#define ZTS_API
-#define ZTCALL
+    #define ZTS_API
+    #define ZTCALL
 #endif
 
 //----------------------------------------------------------------------------//