From e2d8cf257019815d4d84d8a52b70198d92c2d9db Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 28 Nov 2010 19:28:03 +0000 Subject: [PATCH] [CMAKE] Don't compile CRT_fp8.c, CRT_fp10.c and xtxtmode.c. we don't need those and MSVC complains about duplicate symbols, as it's exported from msvcrt already. svn path=/branches/cmake-bringup/; revision=49854 --- lib/3rdparty/mingw/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/3rdparty/mingw/CMakeLists.txt b/lib/3rdparty/mingw/CMakeLists.txt index 92603584fc0..fa46245fc02 100644 --- a/lib/3rdparty/mingw/CMakeLists.txt +++ b/lib/3rdparty/mingw/CMakeLists.txt @@ -13,8 +13,6 @@ list(APPEND MINGW_COMMON_SOURCE binmode.c charmax.c cinitexe.c - CRT_fp10.c - CRT_fp8.c CRT_glob.c crt_handler.c dllentry.c @@ -64,6 +62,7 @@ add_definitions(-DCRTDLL -D_WINDOWS_) add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk) +if (NOT MSVC) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a @@ -72,6 +71,7 @@ add_custom_command( set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +endif() add_library(getopt getopt.c) set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL1 __USE_CRTIMP)