matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jacob1 2017-10-13 00:03:35 -04:00
parent 536b20b164
commit 3c2de70564
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConscript
View File

@ -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:

4
src/common/tpt-thread.h
View File

@ -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