diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-18 09:17:22 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-18 09:17:22 +0200 |
| commit | e6e7bf78360f2b8c2f78f799454d1579b6eb7718 (patch) | |
| tree | a8a4d4146cfba30d0aadfaf062ce0adb7abcaa1e | |
| parent | 26f7e828b53c3fd1ac5a184878f4b1df43a40e46 (diff) | |
| parent | 436ae875436754c1146da144da52eac60ae4e631 (diff) | |
Merge branch 'unstable' into trackhat-ui
| -rw-r--r-- | cmake/mingw-w64.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index 7e34746d..80ecf0f5 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -25,16 +25,13 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(lto "-flto -fuse-linker-plugin") -set(rice "-fmerge-all-constants -fipa-pta -fipa-icf -fweb -fmodulo-sched -fmodulo-sched-allow-regmoves -fgcse-sm -fgcse-las") set(cpu "-O3 -march=i686 -mtune=corei7-avx -ffast-math -mfpmath=both -msse -msse2 -mno-sse3 -mno-avx") -set(lto-link "${lto} -flto-partition=none -fno-fat-lto-objects") set(CFLAGS-OVERRIDE "" CACHE STRING "") -set(CMAKE_C_FLAGS_RELEASE "${rice} ${lto} ${cpu} ${CFLAGS-OVERRIDE}" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS_RELEASE "${rice} ${cpu} ${CFLAGS-OVERRIDE}" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} CACHE STRING "" FORCE) -set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${cpu} ${lto-link} ${CFLAGS-OVERRIDE}" CACHE STRING "" FORCE) +set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${cpu} ${CFLAGS-OVERRIDE}" CACHE STRING "" FORCE) set(CMAKE_EXE_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING "" FORCE) set(CMAKE_BUILD_TYPE "RELEASE" CACHE STRING "" FORCE) |