[CMAKE]

[reactos.git] / msc.cmake

diff --git a/msc.cmake b/msc.cmake
index 91d2886..a09efaf 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -1,6 +1,7 @@
 \r
-if(0) # Fixme redefinition warning\r
-if(OPTIMIZE STREQUAL "1")\r
+if(${CMAKE_BUILD_TYPE} MATCHES Debug)\r
+    # no optimitation\r
+elseif(OPTIMIZE STREQUAL "1")\r
     add_definitions(/O1)\r
 elseif(OPTIMIZE STREQUAL "2")\r
     add_definitions(/O2)\r
@@ -11,15 +12,14 @@ elseif(OPTIMIZE STREQUAL "4")
 elseif(OPTIMIZE STREQUAL "5")\r
     add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-)\r
 endif()\r
-endif()\r
 \r
-add_definitions(/GS- /Zl /Zi)\r
+add_definitions(/X /GR- /GS- /Zl)\r
 add_definitions(-Dinline=__inline -D__STDC__=1)\r
 \r
 if(${_MACHINE_ARCH_FLAG} MATCHES X86)\r
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")\r
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")\r
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")\r
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")\r
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")\r
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")\r
 endif()\r
 \r
 if(${ARCH} MATCHES amd64)\r
@@ -28,7 +28,8 @@ endif()
 \r
 link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)\r
 \r
-set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")\r
+set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})\r
+set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})\r
 \r
 macro(add_pch _target_name _header_filename _src_list)\r
     get_filename_component(FILE ${_header_filename} NAME)\r
@@ -120,6 +121,7 @@ macro(set_module_type MODULE TYPE)
         set_image_base(${MODULE} 0x00010000)\r
         add_linkerflag(${MODULE} "/DRIVER")\r
         add_dependencies(${MODULE} bugcodes)\r
+        target_link_libraries(${MODULE} msvcsup)\r
     endif()\r
 endmacro()\r
 \r
@@ -128,9 +130,6 @@ macro(set_unicode)
    set(IS_UNICODE 1)\r
 endmacro()\r
 \r
-set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")\r
-set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")\r
-\r
 macro(set_rc_compiler)\r
 # dummy, this workaround is only needed in mingw due to lack of RC support in cmake\r
 endmacro()\r
@@ -157,7 +156,7 @@ macro(add_importlib_target _exports_file)
     # Assemble the stub file\r
     add_custom_command(\r
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj\r
-        COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
+        COMMAND ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
         DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm")\r
 \r
     # Add neccessary importlibs for redirections\r
@@ -196,7 +195,6 @@ macro(spec2def _dllname _spec_file)
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c\r
         PROPERTIES GENERATED TRUE)\r
-    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)\r
 endmacro()\r
 \r
 macro(macro_mc FILE)\r