[CMAKE]

[reactos.git] / lib / 3rdparty / mingw / CMakeLists.txt

diff --git a/lib/3rdparty/mingw/CMakeLists.txt b/lib/3rdparty/mingw/CMakeLists.txt
index 0e27253..2dc9e03 100644 (file)
--- a/lib/3rdparty/mingw/CMakeLists.txt
+++ b/lib/3rdparty/mingw/CMakeLists.txt
@@ -1,9 +1,13 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/mingw-w64)
 
-add_definitions(-D_CRTBLD -Wno-main)
+add_definitions(-D_CRTBLD)
 
-set(MINGW_COMMON_SOURCE
+if(NOT MSVC)
+add_definitions(-Wno-main)
+endif(NOT MSVC)
+
+list(APPEND MINGW_COMMON_SOURCE
   _newmode.c
   atonexit.c
   binmode.c
@@ -23,6 +27,7 @@ set(MINGW_COMMON_SOURCE
   pseudo-reloc.c
   pseudo-reloc-list.c
   tlsmcrt.c
+  tlsmthread.c
   tlssup.c
   tlsthrd.c
   txtmode.c
@@ -31,37 +36,38 @@ set(MINGW_COMMON_SOURCE
   xthdloc.c
   xtxtmode.c
   ofmt_stub.c
-  cxa_pure_virtual.c
-)
+  cxa_pure_virtual.c)
 
 add_library(mingw_common ${MINGW_COMMON_SOURCE})
-target_link_libraries(mingw_common oldnames)
 
-set_property(TARGET mingw_common PROPERTY COMPILE_DEFINITIONS _M_CEE_PURE)
+if(NOT MSVC)
+  target_link_libraries(mingw_common)
+#  add_importlibs(mingw_common kernel32 ntdll oldnames)
+#  add_dependencies(mingw_common oldnames)
+endif(NOT MSVC)
 
+set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
 add_dependencies(mingw_common psdk)
 
-
 add_library(mingw_main crt0_c.c crtexe.c dllargv.c)
 set_property(TARGET mingw_main PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)
 add_dependencies(mingw_main psdk)
 
-add_library(mingw_wmain crt0_c.c crtexe.c dllargv.c)
+add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c)
 set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE)
 add_dependencies(mingw_wmain psdk)
 
 add_library(mingw_dllmain crtdll.c dllargv.c)
 add_dependencies(mingw_dllmain psdk)
 
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a
-  COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_SOURCE_DIR}/lib/3rdparty/mingw/moldname-msvcrt.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a
-  COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a
-)
+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
+  COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
 
-SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE)
 
-ADD_CUSTOM_TARGET(oldnames ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a)
+add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
 
 add_library(getopt getopt.c)
 set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)