immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GLEW_STATIC redefinition warnings

fix-squashed-planets
MrSimbax 2020-07-13 21:33:36 +02:00
parent c15efbad7b
commit 634efbcabd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/mxe.cmake
View File

@ -8,8 +8,10 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS))
set(PLATFORM_LINUX 0) set(PLATFORM_LINUX 0)
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
# All must be static, CBOT and GLEW too # All must be static, CBOT and GLEW too
set(BUILD_STATIC ON)
set(CBOT_STATIC ON) set(CBOT_STATIC ON)
set(GLEW_STATIC ON) set(GLEW_STATIC ON)
set(SNDFILE_STATIC ON)
if (${OPENAL_SOUND}) if (${OPENAL_SOUND})
set(OPENAL_MXE_LIBS set(OPENAL_MXE_LIBS

2
src/common/config.h.cmake
View File

@ -12,7 +12,9 @@
#define HAVE_CFLOCALECOPYCURRENT 1 #define HAVE_CFLOCALECOPYCURRENT 1
#endif #endif
#ifndef GLEW_STATIC
#cmakedefine GLEW_STATIC #cmakedefine GLEW_STATIC
#endif
#cmakedefine OPENAL_SOUND #cmakedefine OPENAL_SOUND