X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-mingw32.cmake;h=0395530bf4376afa6922ddb761e06aa63c0baf57;hp=7deaee26fde33fe0a64da129ab961b42ecc43413;hb=13dc8a47611c9de342b6796a9774d552d390296f;hpb=0d72b49f469d1a64348cf09b28456dbf4f223818

diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 7deaee26fde..0395530bf43 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -1,12 +1,20 @@
 
-SET(ARCH i386)
+if(NOT ARCH)
+set(ARCH i386)
+endif(NOT ARCH)
 
 # Choose the right MinGW prefix
-if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-set(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-")
-endif()
+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")
+endif(ARCH MATCHES i386)
 
 # the name of the target operating system
 SET(CMAKE_SYSTEM_NAME Windows)
@@ -15,8 +23,16 @@ SET(CMAKE_SYSTEM_PROCESSOR i686)
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc)
 SET(CMAKE_CXX_COMPILER ${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> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
+
+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> ")
+
+# Use stdcall fixups, and don't link with anything by default unless we say so
+set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here
+#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
@@ -24,3 +40,4 @@ SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+