- Sync with trunk r58248 to bring the latest changes from Amine (headers) and others...

[reactos.git] / toolchain-gcc.cmake

diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake
index d760592..f2ef79a 100644 (file)
--- a/toolchain-gcc.cmake
+++ b/toolchain-gcc.cmake
@@ -3,19 +3,29 @@ if(NOT ARCH)
     set(ARCH i386)
 endif()
 
-# Choose the right MinGW prefix
-if(ARCH MATCHES i386)
-
-    if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-        set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix")
-    else()
-        set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix")
-    endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-
-elseif(ARCH MATCHES amd64)
-    set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix")
-elseif(ARCH MATCHES arm)
-    set(MINGW_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Prefix")
+# Choose the right MinGW toolchain prefix
+if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
+    if(ARCH STREQUAL "i386")
+
+        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+            set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
+        else()
+            if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1)
+                set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
+            else()
+                set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+            endif()
+        endif()
+
+    elseif(ARCH STREQUAL "amd64")
+        set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+    elseif(ARCH STREQUAL "arm")
+        set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix")
+    endif()
+endif()
+
+if (NOT DEFINED MINGW_TOOLCHAIN_SUFFIX)
+    set(MINGW_TOOLCHAIN_SUFFIX "" CACHE STRING "MinGW Toolchain Suffix")
 endif()
 
 if(ENABLE_CCACHE)
@@ -28,15 +38,17 @@ endif()
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
-# Which compilers to use for C and C++
-set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc)
-set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++)
-set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres)
-set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc)
+# Which tools to use
+set(CMAKE_C_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX})
+set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX})
+set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX})
+set(CMAKE_ASM_COMPILER_ID "GNU")
+set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc)
+set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres)
+set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool)
 
-if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-    set(CMAKE_AR ${MINGW_PREFIX}ar)
-    set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>")
+if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
     set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
     set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
 endif()
@@ -47,4 +59,7 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
 #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES)
 set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries")
 
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
+
+# Get GCC version
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)