fix compilation / ensure this check only runs when compiling on windows

The-Powder-Toy · Oct 13, 2017 · 3c2de70 · 3c2de70
1 parent 536b20b
commit 3c2de70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/SConscript b/SConscript
@@ -473,7 +473,10 @@ elif GetOption('release'):
 
 if GetOption('static'):
 	if platform == "Windows":
-		env.Append(CPPDEFINES=['_PTW32_STATIC_LIB'])
+		if compilePlatform == "Windows":
+			env.Append(CPPDEFINES=['_PTW32_STATIC_LIB'])
+		else:
+			env.Append(CPPDEFINES=['PTW32_STATIC_LIB'])
 		if msvc:
 			env.Append(CPPDEFINES=['ZLIB_WINAPI'])
 		else:

diff --git a/src/common/tpt-thread.h b/src/common/tpt-thread.h
@@ -17,8 +17,8 @@
 #undef GetUserName
 
 // Fix deprecation warnings with recent pthread versions on Windows
-#ifdef _PTW32_STATIC_LIB
-#if PTW32_VERSION =< 2, 8, 0, 0
+#if defined(_PTW32_STATIC_LIB) && defined(WIN)
+#if PTW32_VERSION <= 2, 8, 0, 0
 #define PTW32_STATIC_LIB
 #endif
 #endif