[ros-diffs] [tkreuzer] 49854: [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.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Nov 28 19:28:04 UTC 2010


Author: tkreuzer
Date: Sun Nov 28 19:28:03 2010
New Revision: 49854

URL: http://svn.reactos.org/svn/reactos?rev=49854&view=rev
Log:
[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.

Modified:
    branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt

Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt?rev=49854&r1=49853&r2=49854&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Nov 28 19:28:03 2010
@@ -13,8 +13,6 @@
     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_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 @@
 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)




More information about the Ros-diffs mailing list