[CMAKE]

[reactos.git] / reactos / toolchain-gcc.cmake

diff --git a/reactos/toolchain-mingw32.cmake b/reactos/toolchain-gcc.cmake
similarity index 67%
rename from reactos/toolchain-mingw32.cmake
rename to reactos/toolchain-gcc.cmake
index 4a0ca33..d760592 100644 (file)
--- a/reactos/toolchain-mingw32.cmake
+++ b/reactos/toolchain-gcc.cmake
@@ -24,16 +24,15 @@ else()
     set(CCACHE "" CACHE STRING "ccache")
 endif()
 
-# the name of the target operating system
+# The name of the target operating system
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
-# which compilers to use for C and C++
+# 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)
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
 
 if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
     set(CMAKE_AR ${MINGW_PREFIX}ar)
@@ -42,15 +41,10 @@ if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
     set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
 endif()
 
-# Use stdcall fixups, and don't link with anything by default unless we say so
+# 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")
 
-if(ARCH MATCHES i386)
-    set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
-#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
-elseif(ARCH MATCHES amd64)
-    set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
-endif()
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")