diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-05 23:20:38 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-05 23:20:38 +0000 |
| commit | 0e00056075b558429153ce6833136de77e1e7421 (patch) | |
| tree | 2392215556085f0f79613c86e58238f83e62c981 /Toolchain | |
| parent | 036d3017adef07e603bbf7833cd63fb960af22f4 (diff) | |
| download | navit-0e00056075b558429153ce6833136de77e1e7421.tar.gz | |
Fix:build/cmake:Fixed mingw builds without using the toolchain files
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4301 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
| -rw-r--r-- | Toolchain/arm-mingw32ce.cmake | 1 | ||||
| -rw-r--r-- | Toolchain/mingw32.cmake | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Toolchain/arm-mingw32ce.cmake b/Toolchain/arm-mingw32ce.cmake index d929be9d1..f72098b48 100644 --- a/Toolchain/arm-mingw32ce.cmake +++ b/Toolchain/arm-mingw32ce.cmake @@ -4,6 +4,5 @@ SET(CMAKE_SYSTEM_NAME WINCE) SET(CMAKE_C_COMPILER "arm-mingw32ce-gcc") SET(CMAKE_CXX_COMPILER "arm-mingw32ce-g++") SET(CMAKE_RC_COMPILER_INIT "arm-mingw32ce-windres") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") SET(PKG_CONFIG_EXECUTABLE "arm-mingw32ce-pkg-config") SET(WINCE TRUE) diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake index 653680ede..cfab92dd3 100644 --- a/Toolchain/mingw32.cmake +++ b/Toolchain/mingw32.cmake @@ -4,7 +4,6 @@ FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-mingw32-gcc i586-mingw32-gcc mingw32-gc 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 windres.exe) -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") FIND_PROGRAM(CMAKE_AR NAMES i686-mingw32-ar i586-mingw32-ar mingw32-ar ar.exe) |