diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Toolchain/arm-mingw32ce.cmake | 2 | ||||
| -rw-r--r-- | Toolchain/mingw32.cmake | 3 | ||||
| -rw-r--r-- | navit/CMakeLists.txt | 7 |
4 files changed, 12 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a2ae454af..6be1b06b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ if(WIN32 OR WINCE) else(MSVC) set(ENABLE_NLS TRUE) endif(MSVC) - + enable_language(RC) endif() if (WIN32) set(HAVE_API_WIN32 1) 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 diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 5a734b856..b27313e75 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -62,7 +62,12 @@ if(ANDROID) set(NAVIT_LIBNAME navit) else() set(NAVIT_LIBNAME navit_core) - add_executable (navit start.c) + if(WIN32 OR WINCE) + add_executable (navit start.c ${CMAKE_CURRENT_SOURCE_DIR}/gui/win32/resources/resource.rc) + else() + add_executable (navit start.c) + endif() + target_link_libraries (navit ${NAVIT_LIBNAME}) set_target_properties(navit PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}") endif() |