diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-14 22:23:27 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-14 22:23:27 +0000 |
| commit | 0f66a1fb03defad6b30cbf3fb175f4ae620a8993 (patch) | |
| tree | 233ce5dad8542a87cb0cafb4a397f7e140f22d9a /Toolchain | |
| parent | 7404c9bff08b107da7e90a070dc19853c4e813c3 (diff) | |
| download | navit-0f66a1fb03defad6b30cbf3fb175f4ae620a8993.tar.gz | |
Fix:Build/cmake:Fixed building on windows
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4163 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
| -rw-r--r-- | Toolchain/mingw32.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake index d59fb4a7b..67b9dcc4b 100644 --- a/Toolchain/mingw32.cmake +++ b/Toolchain/mingw32.cmake @@ -3,9 +3,11 @@ SET(CMAKE_SYSTEM_NAME Windows) FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-mingw32-gcc i586-mingw32-gcc mingw32-gcc) FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-mingw32-g++ i586-mingw32-gcc mingw32-g++) -FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-mingw32-windres i586-mingw32-windres mingw32-windres) +FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-mingw32-windres i586-mingw32-windres mingw32-windres windres.exe) SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") +FIND_PROGRAM(CMAKE_AR i686-mingw32-ar i586-mingw32-ar mingw32-ar ar.exe) + EXECUTE_PROCESS( COMMAND ${CMAKE_C_COMPILER} -print-sysroot OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH |