diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-06-16 18:01:08 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-06-16 18:01:08 +0000 |
| commit | c47138c82341a0d8f04c0270c63c658209cce3c0 (patch) | |
| tree | 0cede92166134f65050efe35e2911d9eed76de91 | |
| parent | bc97fd6203e62f5774849f13262ab27eb5053145 (diff) | |
| download | navit-c47138c82341a0d8f04c0270c63c658209cce3c0.tar.gz | |
Fix:Build:Better compatibility with older mingw
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4532 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Toolchain/mingw32.cmake | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c112a8b0a..c56f4ed25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,7 @@ if(WIN32 OR WINCE) add_module(graphics/win32 "Windows detected" TRUE) add_plugin(support/win32 "Windows detected" TRUE) - SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") + SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I ${CMAKE_CURRENT_SOURCE_DIR}/navit/gui/win32/resources <DEFINES> -i <SOURCE> -o <OBJECT>") set_with_reason(support/ezxml "Windows detected" TRUE) set_with_reason(speech/espeak "Windows detected" TRUE) set_with_reason(support/espeak "Windows detected" TRUE) diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake index 89c7eb06d..f63758bd3 100644 --- a/Toolchain/mingw32.cmake +++ b/Toolchain/mingw32.cmake @@ -1,16 +1,18 @@ 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_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_RC_COMPILER_INIT NAMES i686-mingw32-windres i586-mingw32-windres mingw32-windres windres.exe) +FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres windres.exe) -FIND_PROGRAM(CMAKE_AR NAMES i686-mingw32-ar i586-mingw32-ar mingw32-ar ar.exe) +FIND_PROGRAM(CMAKE_AR NAMES i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar ar.exe) +IF (NOT CMAKE_FIND_ROOT_PATH) EXECUTE_PROCESS( COMMAND ${CMAKE_C_COMPILER} -print-sysroot OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH ) +ENDIF(NOT CMAKE_FIND_ROOT_PATH) set(PKG_CONFIG_EXECUTABLE "mingw32-pkg-config") |