diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 09:01:32 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 09:01:32 +0100 |
| commit | d785d3616500d5846ac8c5f5a6347da832a593b4 (patch) | |
| tree | ac670a125c5b880ad7e4b4f24a8635da4e66f0da /cmake/mingw-w64.cmake | |
| parent | 232c2ba8aca7900eaa950c48813ddfaca8a749a8 (diff) | |
| parent | 9b736d361bcde7a2ddaf3fe54b471c0e658e94f4 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name
Diffstat (limited to 'cmake/mingw-w64.cmake')
| -rw-r--r-- | cmake/mingw-w64.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index 8604dafb..02ab66cb 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -7,7 +7,7 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler -set(c /c/mingw-w64/i686-4.9.2-posix-sjlj-rt_v4-rev4/mingw32/bin/i686-w64-mingw32-) +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++) |