diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
commit | 232c2ba8aca7900eaa950c48813ddfaca8a749a8 (patch) | |
tree | c08da2e256be5b5e80fac3f611f956fef275f142 /cmake/mingw-w64.cmake | |
parent | 7128fe581ee2ed25fe8e43ec2be9644e2539e2ad (diff) | |
parent | 06a0a71f27134a86d19612fd786bfc2ca6f4c4bb (diff) |
Merge branch 'unstable' into trackhat
* unstable:
fix vtable mess
xargs sed -i -e s/'FaceTrackNoIR Error/Error/g'
support rift 0.2.5, 0.4.2, 0.8.0
rift: finish 0.2.5 support
buffer flush
rename "clientfiles/" to "contrib/" as customary
add dropbox uploader to contrib
add description on wiki for camera offset
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 1f60993a..8604dafb 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 i686-w64-mingw32-) +set(c /c/mingw-w64/i686-4.9.2-posix-sjlj-rt_v4-rev4/mingw32/bin/i686-w64-mingw32-) SET(CMAKE_C_COMPILER ${c}gcc) SET(CMAKE_CXX_COMPILER ${c}g++) |