From c925f6d0a1de23ed8904eaba8e28b21d111d4070 Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Thu, 26 Mar 2015 06:12:29 +0000 Subject: [PATCH] Made the MSVC build ignore some default libraries for VS2012 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5933 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 60e9fbe3e244ec936b0d8b4925942b15385e3598 Former-commit-id: e7446ffcd7e63e5d801e97ee01128f09effdf60f --- src/modules/graphic/ssggraph/CMakeLists.txt | 8 ++++++-- src/modules/sound/snddefault/CMakeLists.txt | 5 ++++- src/tools/trackgen/CMakeLists.txt | 5 ++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/graphic/ssggraph/CMakeLists.txt b/src/modules/graphic/ssggraph/CMakeLists.txt index 7e8de3341..79229f273 100644 --- a/src/modules/graphic/ssggraph/CMakeLists.txt +++ b/src/modules/graphic/ssggraph/CMakeLists.txt @@ -50,10 +50,14 @@ IF(WIN32) ENDIF(WIN32) IF(MSVC) - # Ignore some run-time libs to avoid link time warnings and sometimes even crashes. - SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib") + # Ignore some run-time libs to avoid link time warnings and sometimes even crashes. + SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG + "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmt.lib") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE + "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libcmt.lib") ENDIF(MSVC) + # Note: Other sources and headers needed for having them available in IDEs. SD_ADD_LIBRARY(ssggraph MODULE ${SSGGRAPH_SOURCES} ${SSGGRAPH_HEADERS} ${SSGGRAPH_OTHER_SOURCES}) diff --git a/src/modules/sound/snddefault/CMakeLists.txt b/src/modules/sound/snddefault/CMakeLists.txt index a60d8fc8b..89f02403e 100644 --- a/src/modules/sound/snddefault/CMakeLists.txt +++ b/src/modules/sound/snddefault/CMakeLists.txt @@ -33,7 +33,10 @@ ENDIF(WIN32) IF(MSVC) # Ignore some run-time libs to avoid link time warnings and sometimes even crashes. - SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib") + SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG + "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmt.lib") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE + "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libcmt.lib") ENDIF(MSVC) # Note: Headers and other source files needed for having them available in IDEs. diff --git a/src/tools/trackgen/CMakeLists.txt b/src/tools/trackgen/CMakeLists.txt index 527474895..aceb7ed62 100644 --- a/src/tools/trackgen/CMakeLists.txt +++ b/src/tools/trackgen/CMakeLists.txt @@ -21,7 +21,10 @@ ENDIF(COMMAND CMAKE_POLICY) IF(MSVC) # Ignore some run-time libs to avoid link time warnings and sometimes even crashes. - SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG + "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmt.lib") + SET(CMAKE_EXE_LINKER_FLAGS_RELEASE + "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libcmt.lib") ENDIF(MSVC) # Note: Headers and other sources needed for having them available in IDEs.