summaryrefslogtreecommitdiffhomepage
path: root/cmake
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-03-06 06:08:32 +0100
committerStanislaw Halik <sthalik@misaki.pl>2016-03-06 06:08:32 +0100
commit6c7e66e15fa4d93523b0a8083ae55422f9778a01 (patch)
treef88c456450757699ed1156c017706acf71d6ec2e /cmake
parent1a6b611b2fa64cc730f8f8ea7a716d6b5af1461e (diff)
cmake: update compiler path in toolchain file
We're now using dw2 rather than sjlj for official builds.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/mingw-w64.cmake22
1 files changed, 13 insertions, 9 deletions
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake
index 679f67de..7d097422 100644
--- a/cmake/mingw-w64.cmake
+++ b/cmake/mingw-w64.cmake
@@ -7,15 +7,19 @@ SET(CMAKE_SYSTEM_NAME Windows)
SET(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
-set(c /c/mingw-w64/i686-5.2.0-posix-sjlj-rt_v4-rev0/mingw32/bin/i686-w64-mingw32-)
-
-SET(CMAKE_C_COMPILER ${c}gcc)
-SET(CMAKE_CXX_COMPILER ${c}g++)
-set(CMAKE_RC_COMPILER ${c}windres)
-set(CMAKE_LINKER ${c}ld)
-set(CMAKE_AR ${c}gcc-ar CACHE STRING "" FORCE)
-set(CMAKE_NM ${c}gcc-nm CACHE STRING "" FORCE)
-set(CMAKE_RANLIB ${c}gcc-ranlib CACHE STRING "" FORCE)
+set(p c:/mingw-w64/i686-5.3.0-posix-dwarf-rt_v4-rev0/mingw32/bin)
+set(c ${p}/i686-w64-mingw32-)
+set(CMAKE_MAKE_PROGRAM ${p}/mingw32-make.exe CACHE FILEPATH "" FORCE)
+
+set(e .exe)
+
+SET(CMAKE_C_COMPILER ${c}gcc${e})
+SET(CMAKE_CXX_COMPILER ${c}g++${e})
+set(CMAKE_RC_COMPILER ${c}windres${e})
+set(CMAKE_LINKER ${c}ld${e})
+set(CMAKE_AR ${c}gcc-ar${e} CACHE STRING "" FORCE)
+set(CMAKE_NM ${c}gcc-nm${e} CACHE STRING "" FORCE)
+set(CMAKE_RANLIB ${c}gcc-ranlib${e} CACHE STRING "" FORCE)
SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)