diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-29 00:09:37 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-29 00:09:37 +0100 |
| commit | 7249e4cce3281547948100eafbf1ef73fc235a00 (patch) | |
| tree | 7302889004df4047bfda5a138a2d7a06be19f862 /CMakeLists.txt | |
| parent | b0769de5dfd0e01039dbadcf4b0469e77175fd4f (diff) | |
cmake: annual mingw-w64 update
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ae7a7faa..0a3e3ecc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) add_definitions(-std=c++11) endif() -if(WIN32) +if(WIN32 AND MSVC) set(SDK_GOOGLE_BREAKPAD "" CACHE PATH "google-breakpad for crash reporting") endif() @@ -117,8 +117,8 @@ include_directories(${CMAKE_SOURCE_DIR}) if(WIN32) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) - #set(CMAKE_RC_COMPILER_INIT windres) - SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") + set(CMAKE_RC_COMPILER_INIT i686-w64-mingw32-windres) + SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") else() #set(CMAKE_RC_COMPILER_INIT rc) endif() @@ -626,9 +626,6 @@ endif() "${SDK_GOOGLE_BREAKPAD}/src/client/windows/Release/lib/crash_generation_client.lib" "${SDK_GOOGLE_BREAKPAD}/src/client/windows/Release/lib/exception_handler.lib" "${SDK_GOOGLE_BREAKPAD}/src/client/windows/Release/lib/common.lib") - else() - target_link_libraries(opentrack "${SDK_GOOGLE_BREAKPAD}/lib/libbreakpad_client.a" - "${SDK_GOOGLE_BREAKPAD}/lib/libbreakpad.a") endif() endif() set_target_properties(opentrack PROPERTIES COMPILE_FLAGS -DOPENTRACK_MAIN) |