Fix MSVC compilation (again)
parent
d4b2f23c4a
commit
8f122d6603
|
@ -198,7 +198,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
|||
add_definitions(-DNOEXCEPT= -DHAS_MSVC_EXCEPTION_BUG)
|
||||
|
||||
# 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")
|
||||
else()
|
||||
message(FATAL_ERROR "Your C++ compiler doesn't seem to be supported.")
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
#include "CBot/CBotVar/CBotVar.h"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
namespace CBot
|
||||
{
|
||||
|
||||
|
|
|
@ -66,6 +66,8 @@ elseif(PLATFORM_WINDOWS)
|
|||
find_library(WEBP_LIBRARY NAMES webp.lib)
|
||||
find_library(LZMA_LIBRARY NAMES lzma.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
|
||||
${LIBINTL_LIBRARY}
|
||||
${OPENAL_MSVC_LIBS}
|
||||
|
@ -75,6 +77,8 @@ elseif(PLATFORM_WINDOWS)
|
|||
${WEBP_LIBRARY}
|
||||
${LZMA_LIBRARY}
|
||||
${FREETYPE_LIBRARY}
|
||||
${ICONV_LIBRARY}
|
||||
${CHARSET_LIBRARY}
|
||||
winmm.lib
|
||||
dxguid.lib
|
||||
imm32.lib
|
||||
|
@ -83,6 +87,7 @@ elseif(PLATFORM_WINDOWS)
|
|||
version.lib
|
||||
wsock32.lib
|
||||
ws2_32.lib
|
||||
setupapi.lib
|
||||
)
|
||||
else(${MSVC_STATIC})
|
||||
set(MSVC_LIBS ${LIBINTL_LIBRARY})
|
||||
|
|
Loading…
Reference in New Issue