Revert part of 4adffde02c to get Windows (MSVC2013) compiling again

This commit is contained in:
Joshua Leung 2016-05-18 23:40:32 +12:00
parent 41a6829021
commit 1283c66146
1 changed files with 2 additions and 9 deletions

View File

@ -1328,15 +1328,8 @@ elseif(WIN32)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
set(PLATFORM_LINKFLAGS
"/SUBSYSTEM:CONSOLE "
"/STACK:2097152 "
"/INCREMENTAL:NO "
"/NODEFAULTLIB:msvcrt.lib "
"/NODEFAULTLIB:msvcmrt.lib "
"/NODEFAULTLIB:msvcurt.lib "
"/NODEFAULTLIB:msvcrtd.lib "
)
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO ")
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
# Ignore meaningless for us linker warnings.
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221")