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

Fix MSVC compilation (again)

modernize-cmake-1
MrSimbax 2020-04-03 20:18:14 +02:00
parent d4b2f23c4a
commit 8f122d6603
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -198,7 +198,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_definitions(-DNOEXCEPT= -DHAS_MSVC_EXCEPTION_BUG) add_definitions(-DNOEXCEPT= -DHAS_MSVC_EXCEPTION_BUG)
# Needed for Debug information (it's set to "No" by default for some reason) # Needed for Debug information (it's set to "No" by default for some reason)
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:LIBCMT")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
else() else()
message(FATAL_ERROR "Your C++ compiler doesn't seem to be supported.") message(FATAL_ERROR "Your C++ compiler doesn't seem to be supported.")

2
src/CBot/CBotInstr/CBotExprLitString.cpp
View File

@ -24,6 +24,8 @@
#include "CBot/CBotVar/CBotVar.h" #include "CBot/CBotVar/CBotVar.h"
#include <stdexcept>
namespace CBot namespace CBot
{ {

5
src/CMakeLists.txt
View File

@ -66,6 +66,8 @@ elseif(PLATFORM_WINDOWS)
find_library(WEBP_LIBRARY NAMES webp.lib) find_library(WEBP_LIBRARY NAMES webp.lib)
find_library(LZMA_LIBRARY NAMES lzma.lib) find_library(LZMA_LIBRARY NAMES lzma.lib)
find_library(FREETYPE_LIBRARY NAMES freetype.lib) find_library(FREETYPE_LIBRARY NAMES freetype.lib)
find_library(ICONV_LIBRARY NAMES libiconv.lib)
find_library(CHARSET_LIBRARY NAMES libcharset.lib)
set(MSVC_LIBS set(MSVC_LIBS
${LIBINTL_LIBRARY} ${LIBINTL_LIBRARY}
${OPENAL_MSVC_LIBS} ${OPENAL_MSVC_LIBS}
@ -75,6 +77,8 @@ elseif(PLATFORM_WINDOWS)
${WEBP_LIBRARY} ${WEBP_LIBRARY}
${LZMA_LIBRARY} ${LZMA_LIBRARY}
${FREETYPE_LIBRARY} ${FREETYPE_LIBRARY}
${ICONV_LIBRARY}
${CHARSET_LIBRARY}
winmm.lib winmm.lib
dxguid.lib dxguid.lib
imm32.lib imm32.lib
@ -83,6 +87,7 @@ elseif(PLATFORM_WINDOWS)
version.lib version.lib
wsock32.lib wsock32.lib
ws2_32.lib ws2_32.lib
setupapi.lib
) )
else(${MSVC_STATIC}) else(${MSVC_STATIC})
set(MSVC_LIBS ${LIBINTL_LIBRARY}) set(MSVC_LIBS ${LIBINTL_LIBRARY})