mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-29 19:00:33 +02:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

3
SConscript
View File

@@ -473,7 +473,10 @@ elif GetOption('release'):
if GetOption('static'): if GetOption('static'):
if platform == "Windows": if platform == "Windows":
if compilePlatform == "Windows":
env.Append(CPPDEFINES=['_PTW32_STATIC_LIB']) env.Append(CPPDEFINES=['_PTW32_STATIC_LIB'])
else:
env.Append(CPPDEFINES=['PTW32_STATIC_LIB'])
if msvc: if msvc:
env.Append(CPPDEFINES=['ZLIB_WINAPI']) env.Append(CPPDEFINES=['ZLIB_WINAPI'])
else: else:

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

@@ -17,8 +17,8 @@
#undef GetUserName #undef GetUserName
// Fix deprecation warnings with recent pthread versions on Windows // Fix deprecation warnings with recent pthread versions on Windows
#ifdef _PTW32_STATIC_LIB #if defined(_PTW32_STATIC_LIB) && defined(WIN)
#if PTW32_VERSION =< 2, 8, 0, 0 #if PTW32_VERSION <= 2, 8, 0, 0
#define PTW32_STATIC_LIB #define PTW32_STATIC_LIB
#endif #endif
#endif #endif