From 634efbcabdcc7a6ba9a982abeb03c401b5dc5a52 Mon Sep 17 00:00:00 2001 From: MrSimbax Date: Mon, 13 Jul 2020 21:33:36 +0200 Subject: [PATCH] Fix GLEW_STATIC redefinition warnings --- cmake/mxe.cmake | 2 ++ src/common/config.h.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/mxe.cmake b/cmake/mxe.cmake index 2c440c9f..ed01d8f7 100644 --- a/cmake/mxe.cmake +++ b/cmake/mxe.cmake @@ -8,8 +8,10 @@ if((${CMAKE_CROSSCOMPILING}) AND (DEFINED MSYS)) set(PLATFORM_LINUX 0) set(PLATFORM_OTHER 0) # All must be static, CBOT and GLEW too + set(BUILD_STATIC ON) set(CBOT_STATIC ON) set(GLEW_STATIC ON) + set(SNDFILE_STATIC ON) if (${OPENAL_SOUND}) set(OPENAL_MXE_LIBS diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index 556e067e..7d158653 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -12,7 +12,9 @@ #define HAVE_CFLOCALECOPYCURRENT 1 #endif +#ifndef GLEW_STATIC #cmakedefine GLEW_STATIC +#endif #cmakedefine OPENAL_SOUND