Try to get MinGW-w64 properly configured

diff --git a/Makefile b/Makefile
index 52d29b60f145653842b8a5983dc7c22247b7f1cc..8f2d5a37166eddf57b80c31c485455d9b43c6e24 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,19 +32,19 @@ xcode: $(BUILD_DIR)
 .PHONY : windows
 windows: $(BUILD_DIR)
        cd $(BUILD_DIR); touch README.html; \
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-mingw64.cmake -DCMAKE_BUILD_TYPE=Release ..
+       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-MinGW-w64-64bit.cmake -DCMAKE_BUILD_TYPE=Release ..
 
 # Build Windows zip file using MinGW on *nix
 .PHONY : windows-zip
 windows-zip: $(BUILD_DIR)
        cd $(BUILD_DIR); touch README.html; \
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-mingw64.cmake -DCMAKE_BUILD_TYPE=Release -DZIP=1 ..
+       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-MinGW-w64-64bit.cmake -DCMAKE_BUILD_TYPE=Release -DZIP=1 ..
 
 # Cross-compile for Windows using MinGW on *nix (32-bit)
 .PHONY : windows-32
 windows-32: $(BUILD_DIR)
        cd $(BUILD_DIR); touch README.html; \
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-mingw32.cmake -DCMAKE_BUILD_TYPE=Release ..
+       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/Toolchain-MinGW-w64-32bit.cmake -DCMAKE_BUILD_TYPE=Release ..
 
 # Build Windows zip file using MinGW on *nix (32-bit)
 .PHONY : windows-zip-32

diff --git a/tools/Toolchain-mingw64.cmake b/tools/Toolchain-MinGW-w64-32bit.cmake
similarity index 75%
rename from tools/Toolchain-mingw64.cmake
rename to tools/Toolchain-MinGW-w64-32bit.cmake
index dbba2b4939cadd56358d59a0e274b60dce1fcecf..17347e027d9c583a697cca40be893d2eb1603dbe 100644 (file)
--- a/tools/Toolchain-mingw64.cmake
+++ b/tools/Toolchain-MinGW-w64-32bit.cmake
@@ -1,4 +1,4 @@
-# Settings for compiling for Windows 64-bit machines
+# Settings for compiling for Windows 32-bit machines using MinGW-w64
 
 set (CMAKE_SYSTEM_NAME Windows)
 

diff --git a/tools/Toolchain-MinGW-w64-64bit.cmake b/tools/Toolchain-MinGW-w64-64bit.cmake
new file mode 100644 (file)
index 0000000..9d2b4f8
--- /dev/null
+++ b/tools/Toolchain-MinGW-w64-64bit.cmake
@@ -0,0 +1,9 @@
+# Settings for compiling for Windows 64-bit machines using MinGW-w64
+
+set (CMAKE_SYSTEM_NAME Windows)
+
+set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+
+set (CMAKE_FIND_ROOT_PATH /usr/bin)