projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CMAKE]
[reactos.git]
/
toolchain-mingw32.cmake
diff --git
a/toolchain-mingw32.cmake
b/toolchain-mingw32.cmake
index
655e910
..
0395530
100644
(file)
--- a/
toolchain-mingw32.cmake
+++ b/
toolchain-mingw32.cmake
@@
-1,12
+1,20
@@
+if(NOT ARCH)
set(ARCH i386)
set(ARCH i386)
+endif(NOT ARCH)
# Choose the right MinGW prefix
# 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()
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)
# the name of the target operating system
SET(CMAKE_SYSTEM_NAME Windows)
@@
-19,11
+27,12
@@
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_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/crt/mingw32 -O coff -o <OBJECT> ")
+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
# 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
-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")
+#-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
# adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search