summaryrefslogtreecommitdiff
path: root/Toolchain
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-02 00:37:58 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-02 00:37:58 +0000
commit5e373c3fa6479afc27d4c4b14f91c10d9fea3e35 (patch)
tree817dc19015890883d3a362c56c20e82dda1e71cf /Toolchain
parent2dee25f79b3862f05ddd760d90d39ee22d5350d1 (diff)
downloadnavit-5e373c3fa6479afc27d4c4b14f91c10d9fea3e35.tar.gz
Add:Build/cmake:Added compiling and linking of Win32/WinCE resource file
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4085 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
-rw-r--r--Toolchain/arm-mingw32ce.cmake2
-rw-r--r--Toolchain/mingw32.cmake3
2 files changed, 5 insertions, 0 deletions
diff --git a/Toolchain/arm-mingw32ce.cmake b/Toolchain/arm-mingw32ce.cmake
index d342ec791..d929be9d1 100644
--- a/Toolchain/arm-mingw32ce.cmake
+++ b/Toolchain/arm-mingw32ce.cmake
@@ -3,5 +3,7 @@ SET(CMAKE_SYSTEM_NAME WINCE)
# specify the cross compiler
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 b884771ce..d59fb4a7b 100644
--- a/Toolchain/mingw32.cmake
+++ b/Toolchain/mingw32.cmake
@@ -3,6 +3,9 @@ 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)
+SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+
EXECUTE_PROCESS(
COMMAND ${CMAKE_C_COMPILER} -print-sysroot
OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH