diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-05-18 14:40:32 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-05-18 14:42:53 +0300 |
| commit | 1283c66146732bdb04591f2d84518a6609376360 (patch) | |
| tree | 89ea46f82b31e7e04ef609abd6f9c40492138617 | |
| parent | 41a682902198d352704ffe103346fc26a3a8cfa5 (diff) | |
Revert part of 4adffde02c98f3bb058ffba5ea010a6b1045a7b1 to get Windows (MSVC2013) compiling again
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44a9b687e47..6527cf1c78c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") |