diff --git a/SConscript b/SConscript index ee2e92728..1e306432e 100644 --- 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 index 9299f68a6..276ddd070 100644 --- 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