Permalink
Browse files

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

  • Loading branch information...
jacob1 committed Oct 13, 2017
1 parent 536b20b commit 3c2de70564bba5062ac0b510ecacdb9c1a0c30a1
Showing with 6 additions and 3 deletions.
  1. +4 −1 SConscript
  2. +2 −2 src/common/tpt-thread.h
@@ -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:
@@ -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

0 comments on commit 3c2de70

Please sign in to comment.