[CMAKE]

[reactos.git] / gcc.cmake

diff --git a/gcc.cmake b/gcc.cmake
index dd0a2c8..95bfaa9 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -1,14 +1,17 @@
 
-if(CMAKE_CROSSCOMPILING)
-
 # Linking
-link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)
+if(ARCH MATCHES i386)
+link_directories("${REACTOS_SOURCE_DIR}/importlibs")
+endif()
+link_directories(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)
 set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
 # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")
 
+set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>")
+
 # Compiler Core
 add_definitions(-pipe -fms-extensions)
 
@@ -267,21 +270,26 @@ macro(add_importlib_target _exports_file)
 
     get_filename_component(_name ${_exports_file} NAME_WE)
     get_filename_component(_extension ${_exports_file} EXT)
-
-    if (${_extension} STREQUAL ".spec")
-        if (${ARGC} GREATER 1)
-            set(DLLNAME_OPTION "-n=${ARGV1}")
+    get_target_property(_suffix ${_name} SUFFIX)
+    if(${_suffix} STREQUAL "_suffix-NOTFOUND")
+        get_target_property(_type ${_name} TYPE)
+        if(${_type} MATCHES EXECUTABLE)
+            set(_suffix ".exe")
         else()
-            set(DLLNAME_OPTION "")
+            set(_suffix ".dll")
         endif()
+    endif()
+
+    if (${_extension} STREQUAL ".spec")
 
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            COMMAND native-spec2def ${DLLNAME_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
             COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
 
     elseif(${_extension} STREQUAL ".def")
+        message("Use of def files for import libs is deprecated: ${_exports_file}")
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
             COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
@@ -305,7 +313,6 @@ 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)
-    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
 endmacro()
 
 macro(macro_mc FILE)
@@ -314,5 +321,3 @@ endmacro()
 
 #pseh lib, needed with mingw
 set(PSEH_LIB "pseh")
-
-endif(CMAKE_CROSSCOMPILING)