X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-mingw32.cmake;h=b8b49d2034743fd25c4ccf0c6dffe005b30161eb;hp=c50029b25c4e3e11a8dab514291fe5a406fb92c7;hb=fa0db12e2af3abc3599da18f0a94c5794e15ec45;hpb=5abcbffcd0ea83556bdf81d7bbc365caf402f0a3

diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index c50029b25c4..b8b49d20347 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)
@@ -17,7 +25,23 @@ 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_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
+SET(CMAKE_IDL_COMPILER native-widl)
+
+SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <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 "Standard Libraries")
+
+MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES)
+set(CMAKE_CXX_STANDARD_LIBRARIES "")
+
+if(ARCH MATCHES i386)
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -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,--enable-stdcall-fixup -Wl,--kill-at")
+endif(ARCH MATCHES i386)
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
@@ -25,3 +49,4 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJ
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+