Refactoring:mingw:simplify toolchain

CMakeLists.txt

@@ -3,6 +3,10 @@ set(MACOSX_BUNDLE_BUNDLE_NAME "Navit")
 message(STATUS "Building with CMake V${CMAKE_VERSION}")
 project(navit C)
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL "WINCE")
+		SET(WINCE TRUE)
+endif()
+
 # Workaround for CMake issue 8345 / 9220, see http://trac.navit-project.org/ticket/1041
 if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
 	set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND)

Toolchain/mingw.cmake

@@ -0,0 +1,18 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+
+SET(CMAKE_C_COMPILER ${TARGET_ARCH}-gcc)
+SET(CMAKE_CXX_COMPILER ${TARGET_ARCH}-g++)
+SET(CMAKE_RC_COMPILER_INIT ${TARGET_ARCH}-windres)
+SET(PKG_CONFIG_EXECUTABLE ${TARGET_ARCH}-pkg-config)
+
+SET(QT_MOC_EXECUTABLE bin/moc)
+SET(QT_RCC_EXECUTABLE ${MINGW_INSTALL_PREFIX}/bin/rcc)
+SET(QT_UIC_EXECUTABLE ${MINGW_INSTALL_PREFIX}/bin/uic)
+
+LIST(APPEND CMAKE_PROGRAM_PATH @CMAKE_INSTALL_PREFIX@/bin ...)
+SET(CMAKE_FIND_ROOT_PATH ${MINGW_INSTALL_PREFIX})
+SET(CMAKE_INSTALL_PREFIX ${MINGW_INSTALL_PREFIX})
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

scripts/build_win32.sh

@@ -1,10 +1,27 @@
 #!/usr/bin/env bash
 set -e
+# our support gettext version is uncompatible with mingw-w64 mingw-w64-tools
 apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis libsaxonb-java
 
 mkdir win32
 pushd win32
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make -j $(nproc --all)  && make -j $(nproc --all) package
+# use i686-w64-mingw32 for mingw-w64
+cmake -DTARGET_ARCH=i586-mingw32msvc -DCMAKE_SYSTEM_NAME=WindowsCE \
+  -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake \
+  -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DXSLTS=windows  ../
+
+if ! make -j $(nproc --all)
+then
+    echo  "make"
+    make -d
+    exit 1
+fi
+if ! make -j $(nproc --all) package
+then
+    echo "make package"
+    make -d package
+    exit 1
+fi
 popd
 
 cp win32/*.exe $CIRCLE_ARTIFACTS/

scripts/build_wince.sh

@@ -1,8 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 
-mkdir -p wince && cd wince
-cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows,wince -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=n
+mkdir -p wince
+pushd wince
+cmake ../ -DTARGET_ARCH=arm-mingw32ce -DCMAKE_SYSTEM_NAME=WindowsCE -DCMAKE_TOOLCHAIN_FILE=Toolchain/mingw.cmake \
+ -DXSLTS=windows,wince -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 \
+ -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=n
 make
 
 test -d output && rm -rf output