X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-gcc.cmake;h=6ffe23d89bd7daf571e3e186a3f483459f777504;hp=73713ae5d8ed9bc0dc8c5cfa18c1bd1289a9e1f9;hb=e13ff1470ef2d78361b5b21cb3f5fe6641530b45;hpb=7f2624f282608e1458b7611109edef148a918c8a

diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake
index 73713ae5d8e..6ffe23d89bd 100644
--- a/toolchain-gcc.cmake
+++ b/toolchain-gcc.cmake
@@ -3,19 +3,29 @@ if(NOT ARCH)
     set(ARCH i386)
 endif()
 
+# Default to Debug for the build type
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
+        "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
+endif()
+
 # Choose the right MinGW toolchain prefix
 if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
-    if(ARCH MATCHES i386)
+    if(ARCH STREQUAL "i386")
 
-        if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+        if(CMAKE_HOST_WIN32)
             set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
         else()
-            set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
-        endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+            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 MATCHES amd64)
+    elseif(ARCH STREQUAL "amd64")
         set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix")
-    elseif(ARCH MATCHES arm)
+    elseif(ARCH STREQUAL "arm")
         set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix")
     endif()
 endif()
@@ -42,17 +52,21 @@ 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)
+#set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX})
 
-if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES 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()
+set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <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})
 
 # Don't link with anything by default unless we say so
 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_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries")
 
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import")
+
+set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-gcc.cmake")
+
+# Get GCC version
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)