projects / reactos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[CMAKE]
[reactos.git] / reactos / cmake / gcc.cmake
diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index 2de4e28..fd06a5c 100644 (file)
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -98,7 +98,7 @@ set(CMAKE_RC_COMPILE_OBJECT
     "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
 
 # Optional 3rd parameter: stdcall stack bytes
-macro(set_entrypoint MODULE ENTRYPOINT)
+function(set_entrypoint MODULE ENTRYPOINT)
     if(${ENTRYPOINT} STREQUAL "0")
         add_linkerflag(${MODULE} "-Wl,-entry,0")
     elseif(ARCH MATCHES i386)
@@ -110,17 +110,17 @@ macro(set_entrypoint MODULE ENTRYPOINT)
     else()
         add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}")
     endif()
-endmacro()
+endfunction()
 
-macro(set_subsystem MODULE SUBSYSTEM)
+function(set_subsystem MODULE SUBSYSTEM)
     add_linkerflag(${MODULE} "-Wl,--subsystem,${SUBSYSTEM}")
-endmacro()
+endfunction()
 
-macro(set_image_base MODULE IMAGE_BASE)
+function(set_image_base MODULE IMAGE_BASE)
     add_linkerflag(${MODULE} "-Wl,--image-base,${IMAGE_BASE}")
-endmacro()
+endfunction()
 
-macro(set_module_type MODULE TYPE)
+function(set_module_type MODULE TYPE)
 
     add_dependencies(${MODULE} psdk)
     if(${IS_CPP})
@@ -145,17 +145,17 @@ macro(set_module_type MODULE TYPE)
             set_entrypoint(${MODULE} mainCRTStartup)
         endif(IS_UNICODE)
     elseif(${TYPE} MATCHES win32dll)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         if(DEFINED baseaddress_${MODULE})
             set_image_base(${MODULE} ${baseaddress_${MODULE}})
         else()
             message(STATUS "${MODULE} has no base address")
         endif()
     elseif(${TYPE} MATCHES win32ocx)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
     elseif(${TYPE} MATCHES cpl)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
     elseif(${TYPE} MATCHES kernelmodedriver)
         set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys")
@@ -165,14 +165,14 @@ macro(set_module_type MODULE TYPE)
         add_dependencies(${MODULE} bugcodes)
     elseif(${TYPE} MATCHES nativedll)
         set_subsystem(${MODULE} native)
-               set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMain 12)
     else()
         message(FATAL_ERROR "Unknown module type : ${TYPE}")
     endif()
-endmacro()
+endfunction()
 
 # Workaround lack of mingw RC support in cmake
-macro(set_rc_compiler)
+function(set_rc_compiler)
     get_directory_property(defines COMPILE_DEFINITIONS)
     get_directory_property(includes INCLUDE_DIRECTORIES)
 
@@ -184,12 +184,12 @@ macro(set_rc_compiler)
         set(rc_result_incs "-I${arg} ${rc_result_incs}")
     endforeach()
 
-    #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+    #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>" PARENT_SCOPE)
     set(CMAKE_RC_COMPILE_OBJECT
     "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${rc_result_defs} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -xc -E <SOURCE> -o <OBJECT>"
-    "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} -i <OBJECT> -o <OBJECT>"
-    "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
-endmacro()
+    "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -i <OBJECT> -o <OBJECT>"
+    "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE)
+endfunction()
 
 #idl files support
 set(IDL_COMPILER native-widl)
@@ -200,19 +200,19 @@ elseif(ARCH MATCHES amd64)
     set(IDL_FLAGS -m64 --win64)
 endif()
 
-macro(add_delay_importlibs MODULE)
+function(add_delay_importlibs MODULE)
     foreach(LIB ${ARGN})
         target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a)
         add_dependencies(${MODULE} lib${LIB}_delayed)
     endforeach()
     target_link_libraries(${MODULE} delayimp)
-endmacro()
+endfunction()
 
 if(NOT ARCH MATCHES i386)
     set(DECO_OPTION "-@")
 endif()
 
-macro(add_importlib_target _exports_file)
+function(add_importlib_target _exports_file)
 
     get_filename_component(_name ${_exports_file} NAME_WE)
     get_filename_component(_extension ${_exports_file} EXT)
@@ -265,10 +265,16 @@ macro(add_importlib_target _exports_file)
         lib${_name}_delayed
         DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a)
 
-endmacro()
+endfunction()
+
+function(spec2def _dllname _spec_file)
+
+    if(${ARGC} GREATER 2)
+        set(_file ${ARGV2})
+    else()
+        get_filename_component(_file ${_spec_file} NAME_WE)
+    endif()
 
-macro(spec2def _dllname _spec_file)
-    get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
         COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
@@ -276,7 +282,7 @@ macro(spec2def _dllname _spec_file)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE)
-endmacro()
+endfunction()
 
 macro(macro_mc FILE)
     set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos)
@@ -353,7 +359,7 @@ else()
     endmacro()
 endif()
 
-macro(CreateBootSectorTarget _target_name _asm_file _object_file _base_address)
+function(CreateBootSectorTarget _target_name _asm_file _object_file _base_address)
     get_filename_component(OBJECT_PATH ${_object_file} PATH)
     get_filename_component(OBJECT_NAME ${_object_file} NAME)
     file(MAKE_DIRECTORY ${OBJECT_PATH})
@@ -374,9 +380,9 @@ macro(CreateBootSectorTarget _target_name _asm_file _object_file _base_address)
         DEPENDS ${_asm_file})
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
-endmacro()
+endfunction()
 
-macro(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address)
+function(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address)
     set(_object_file ${_binary_file}.o)
 
     add_custom_command(
@@ -394,4 +400,4 @@ macro(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address)
 
     add_custom_target(${_target_name} ALL DEPENDS ${_binary_file})
 
-endmacro()
+endfunction()
A free Windows-compatible Operating System