[CMAKE]

- Add /nologo, when preprocessing asm files
- Move add_pch to compiler specific files (maybe someone can fix it for MSVC)
- Update set_module_type for MSVC

svn path=/branches/cmake-bringup/; revision=49683

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index b2a7c68..af13ce0 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -27,20 +27,6 @@ MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
 \r
 ENDMACRO(_PCH_GET_COMPILE_FLAGS) \r
 \r
 \r
 ENDMACRO(_PCH_GET_COMPILE_FLAGS) \r
 \r

-MACRO(add_pch _target_name _header_filename _src_list)\r
-    \r
-    get_filename_component(FILE ${_header_filename} NAME)\r
-    set(_gch_filename "${_target_name}_${FILE}.gch")\r
-    list(APPEND ${_src_list} ${_gch_filename})\r
-    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})\r
-    file(REMOVE ${_gch_filename})\r
-    add_custom_command(\r
-        OUTPUT ${_gch_filename}\r
-        COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}\r
-        DEPENDS ${_header_filename})\r
-\r
-ENDMACRO(add_pch _target_name _header_filename _src_list)\r
-\r

 if (NOT MSVC)\r
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
 \r
 if (NOT MSVC)\r
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
 \r

diff --git a/gcc.cmake b/gcc.cmake
index 6d53201..2f5225c 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -33,6 +33,18 @@ add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-e
 add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)
 
 # Macros
 add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)
 
 # Macros

+MACRO(add_pch _target_name _header_filename _src_list)
+    get_filename_component(FILE ${_header_filename} NAME)
+    set(_gch_filename "${_target_name}_${FILE}.gch")
+    list(APPEND ${_src_list} ${_gch_filename})
+    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
+    file(REMOVE ${_gch_filename})
+    add_custom_command(
+        OUTPUT ${_gch_filename}
+        COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}
+        DEPENDS ${_header_filename})
+ENDMACRO(add_pch _target_name _header_filename _src_list)
+

 macro(add_linkerflag MODULE _flag)
     set(NEW_LINKER_FLAGS ${_flag})
     get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
 macro(add_linkerflag MODULE _flag)
     set(NEW_LINKER_FLAGS ${_flag})
     get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)

diff --git a/msc.cmake b/msc.cmake
index a256263..06619f3 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -23,6 +23,18 @@ link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3r
 \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
 \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
 \r

+MACRO(add_pch _target_name _header_filename _src_list)\r
+    get_filename_component(FILE ${_header_filename} NAME)\r
+    set(_gch_filename "${_target_name}_${FILE}.gch")\r
+    list(APPEND ${_src_list} ${_gch_filename})\r
+    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})\r
+    file(REMOVE ${_gch_filename})\r
+    add_custom_command(\r
+        OUTPUT ${_gch_filename}\r
+        COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}\r
+        DEPENDS ${_header_filename})\r
+ENDMACRO(add_pch _target_name _header_filename _src_list)\r
+\r

 macro(add_linkerflag MODULE _flag)\r
     set(NEW_LINKER_FLAGS ${_flag})\r
     get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)\r
 macro(add_linkerflag MODULE _flag)\r
     set(NEW_LINKER_FLAGS ${_flag})\r
     get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)\r


@@ -52,17 +64,27 @@ macro(set_module_type MODULE TYPE)
     add_dependencies(${MODULE} psdk buildno_header)\r
     if(${TYPE} MATCHES nativecui)\r
         set_subsystem(${MODULE} native)\r
     add_dependencies(${MODULE} psdk buildno_header)\r
     if(${TYPE} MATCHES nativecui)\r
         set_subsystem(${MODULE} native)\r

-        add_importlibs(${MODULE} ntdll)\r
+        set_entrypoint(${MODULE} NtProcessStartup@4)\r

     endif()\r
     if (${TYPE} MATCHES win32gui)\r
         set_subsystem(${MODULE} windows)\r
         set_entrypoint(${MODULE} WinMainCRTStartup)\r
     endif()\r
     if (${TYPE} MATCHES win32gui)\r
         set_subsystem(${MODULE} windows)\r
         set_entrypoint(${MODULE} WinMainCRTStartup)\r

-               target_link_libraries(${MODULE} mingw_common mingw_wmain)\r
+        if(IS_UNICODE)\r
+            target_link_libraries(${MODULE} mingw_wmain)\r
+        else()\r
+            target_link_libraries(${MODULE} mingw_main)\r
+        endif()\r
+               target_link_libraries(${MODULE} mingw_common)\r

     endif ()\r
     if (${TYPE} MATCHES win32cui)\r
         set_subsystem(${MODULE} console)\r
         set_entrypoint(${MODULE} mainCRTStartup)\r
     endif ()\r
     if (${TYPE} MATCHES win32cui)\r
         set_subsystem(${MODULE} console)\r
         set_entrypoint(${MODULE} mainCRTStartup)\r

-               target_link_libraries(${MODULE} mingw_common mingw_wmain)\r
+        if(IS_UNICODE)\r
+            target_link_libraries(${MODULE} mingw_wmain)\r
+        else()\r
+            target_link_libraries(${MODULE} mingw_main)\r
+        endif()\r
+               target_link_libraries(${MODULE} mingw_common)\r

     endif ()\r
     if(${TYPE} MATCHES win32dll)\r
         # Need this only because mingw library is broken\r
     endif ()\r
     if(${TYPE} MATCHES win32dll)\r
         # Need this only because mingw library is broken\r


@@ -74,6 +96,14 @@ macro(set_module_type MODULE TYPE)
                endif()\r
                target_link_libraries(${MODULE} mingw_common mingw_dllmain)\r
         add_linkerflag(${MODULE} "/DLL")\r
                endif()\r
                target_link_libraries(${MODULE} mingw_common mingw_dllmain)\r
         add_linkerflag(${MODULE} "/DLL")\r

+    endif()\r
+    if(${TYPE} MATCHES win32ocx)\r
+        set_entrypoint(${MODULE} DllMain@12)\r
+        set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")\r
+    endif()\r
+    if(${TYPE} MATCHES cpl)\r
+        set_entrypoint(${MODULE} DllMain@12)\r
+        set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")\r

     endif()\r
        if(${TYPE} MATCHES kernelmodedriver)\r
            set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")\r
     endif()\r
        if(${TYPE} MATCHES kernelmodedriver)\r
            set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")\r


@@ -86,7 +116,8 @@ macro(set_module_type MODULE TYPE)
 endmacro()\r
 \r
 macro(set_unicode)\r
 endmacro()\r
 \r
 macro(set_unicode)\r

-    add_definitions(-DUNICODE -D_UNICODE)\r
+   add_definitions(-DUNICODE -D_UNICODE)\r
+   set(IS_UNICODE 1)\r

 endmacro()\r
 \r
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")\r
 endmacro()\r
 \r
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")\r

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index a554e1c..4c85a14 100644 (file)
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -35,7 +35,7 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DI
 SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>")\r
 \r
 SET(CMAKE_ASM_COMPILE_OBJECT \r
 SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>")\r
 \r
 SET(CMAKE_ASM_COMPILE_OBJECT \r

-    "<CMAKE_C_COMPILER> /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"\r
+    "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"\r

     "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")\r
 \r
 set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")\r
     "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")\r
 \r
 set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")\r