minor cleanup of MinGW-related scripts

cmake/build_mingw.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ -z "$ARCH" ]; then
+	ARCH=64
+fi
+MINGW=mingw$ARCH
+
+if [ -n "$MSYSCON" ]; then
+    MINGW_PATH=/$MINGW
+	TOOLCHAIN_NAME="MSYS-$ARCH"
+else
+	MINGW_PATH=/opt/$MINGW
+	TOOLCHAIN_NAME="MinGW-W64-$ARCH"
+fi
+
+export PATH=$MINGW_PATH/bin:$PATH
+
+if [ "$ARCH" == "32" ]; then
+	export CFLAGS="-march=pentium4 -mtune=generic -mpreferred-stack-boundary=5 -mfpmath=sse"
+fi
+export CXXFLAGS="$CFLAGS"
+
+CMAKE_OPTS="-DCMAKE_PREFIX_PATH=$MINGW_PATH $CMAKE_OPTS"
+
+# shellcheck disable=SC2086
+cmake "$DIR/.." -DCMAKE_TOOLCHAIN_FILE="$DIR/toolchains/$TOOLCHAIN_NAME.cmake" $CMAKE_OPTS

cmake/build_win32.sh

@@ -1,40 +1,3 @@
 #!/usr/bin/env bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Accomodate both linux windows mingw locations
-if [ -z "$ARCH" ]; then
-	ARCH=32
-fi
-
-MINGW=/mingw$ARCH
-
-if [ -z "$MSYSCON" ]; then
-	MINGW=/opt$MINGW
-
-	DISTRO=$(lsb_release -si)
-	DISTRO_VERSION=$(lsb_release -sr)
-
-	if [ "$DISTRO" != "Ubuntu" ]; then
-		echo "This script only supports Ubuntu"
-		exit 1
-	fi
-
-	if [ "$DISTRO_VERSION" == "14.04" ]; then
-		TOOLCHAIN="$DIR/toolchains/Ubuntu-MinGW-X-Trusty-$ARCH.cmake"
-	else
-		TOOLCHAIN="$DIR/toolchains/Ubuntu-MinGW-W64-$ARCH.cmake"
-	fi
-else
-	TOOLCHAIN="$DIR/toolchains/MSYS-$ARCH.cmake"
-fi
-
-export PATH=$MINGW/bin:$PATH
-export CXXFLAGS="$CFLAGS"
-if [ "$ARCH" == "32" ]; then
-	export CFLAGS="-march=pentium4 -mtune=generic -mpreferred-stack-boundary=5 -mfpmath=sse"
-fi
-
-CMAKE_OPTS="-DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
-
-# shellcheck disable=SC2086
-cmake "$DIR/.." -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" $CMAKE_OPTS
+ARCH=32 "$DIR/build_mingw.sh"

cmake/build_win64.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ARCH=64 "$DIR/build_win32.sh"
+ARCH=64 "$DIR/build_mingw.sh"

cmake/toolchains/MinGW-W64-32.cmake

@@ -0,0 +1,2 @@
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win32.cmake)
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MinGW-W64.cmake)

cmake/toolchains/MinGW-W64-64.cmake

@@ -0,0 +1,4 @@
+SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/MinGW-W64-32.cmake")
+
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win64.cmake)
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MinGW-W64.cmake)

cmake/toolchains/common/Ubuntu-MinGW-W64.cmake → cmake/toolchains/common/MinGW-W64.cmake

@@ -1,5 +1,8 @@
-# Toolchain for Ubuntu MinGw compiler shipped with the mingw-w64 and
-# g++-mingw-w64 packages
+
+SET(CMAKE_SYSTEM_NAME               Windows)
+SET(CMAKE_SYSTEM_VERSION            1)
+
+# Toolchain for MinGW compiler
 SET(TOOLCHAIN_PREFIX      ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
 set(CMAKE_C_COMPILER      ${TOOLCHAIN_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER    ${TOOLCHAIN_PREFIX}-g++)
@@ -14,4 +17,8 @@ IF(WIN64)
 	SET(CMAKE_CXX_COMPILER32 ${TOOLCHAIN_PREFIX32}-g++)
 ENDIF()
 
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/WinCrossCompile.cmake)
+# Search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# Search for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/toolchains/common/Win32.cmake

@@ -1,5 +1,3 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
 
 SET(CMAKE_SYSTEM_PROCESSOR   i686)
 

cmake/toolchains/common/Win64.cmake

@@ -1,5 +1,3 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
 
 SET(CMAKE_SYSTEM_PROCESSOR          x86_64)
 SET(CMAKE_SYSTEM_PROCESSOR32        i686)