diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-04-12 21:34:42 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-04-12 21:34:42 +0000 |
commit | b5b4b733f7dc9fd37da720f0be9bf7980f33d3f2 (patch) | |
tree | 3e2eb49c7b0c3c49ee069829a1532208101aaee5 | |
parent | 1edc0b017540e9ea6e1c07e2c7118902e8bf7ba6 (diff) | |
download | navit-b5b4b733f7dc9fd37da720f0be9bf7980f33d3f2.tar.gz |
Fix:Build:Allow to build mingw32 executables on 64 bit systems
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5432 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | Toolchain/mingw32.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake index f63758bd3..31b7ad99d 100644 --- a/Toolchain/mingw32.cmake +++ b/Toolchain/mingw32.cmake @@ -1,11 +1,11 @@ SET(CMAKE_SYSTEM_NAME Windows) -FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc) -FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-mingw32-g++ i586-mingw32-gcc i386-mingw-gcc mingw32-g++) +FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-w64-mingw32-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc) +FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-w64-mingw32-g++ i686-mingw32-g++ i586-mingw32-gcc i386-mingw32-gcc mingw32-g++) -FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres windres.exe) +FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres windres.exe) -FIND_PROGRAM(CMAKE_AR NAMES i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar ar.exe) +FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar ar.exe) IF (NOT CMAKE_FIND_ROOT_PATH) EXECUTE_PROCESS( |