From be30b9bb78dc7e0896d2540b4ada1027f2221b42 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 22 Oct 2015 09:22:11 +0200
Subject: cmake: update toolchain file

---
 cmake/mingw-w64-debug.cmake | 38 --------------------------------------
 cmake/mingw-w64.cmake       |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 cmake/mingw-w64-debug.cmake

diff --git a/cmake/mingw-w64-debug.cmake b/cmake/mingw-w64-debug.cmake
deleted file mode 100644
index 7a371e5d..00000000
--- a/cmake/mingw-w64-debug.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# this file only serves as toolchain file when specified so explicitly
-# when building the software. from repository's root directory:
-# mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$(pwd)/../cmake/mingw-w64.cmake
-# -sh 20140922
-
-SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_SYSTEM_VERSION 1)
-
-# specify the cross compiler
-set(c 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(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
-
-# search for programs in the host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# don't poison with system compile-time data
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(cpu "-O2 -march=i686 -mtune=corei7-avx -ffast-math -mfpmath=both -msse -msse2 -mno-sse3 -mno-avx")
-set(rice "-ggdb")
-
-set(CFLAGS-OVERRIDE "" CACHE STRING "")
-
-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} ${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)
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake
index 2705c068..1f60993a 100644
--- a/cmake/mingw-w64.cmake
+++ b/cmake/mingw-w64.cmake
@@ -26,7 +26,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 # oldest CPU supported here is Northwood-based Pentium 4. -sh 20150811
-set(fpu "-fno-math-errno -funsafe-math-optimizations -fno-signed-zeros -mfpmath=both")
+set(fpu "-ffast-math -fno-finite-math-only -mfpmath=both")
 set(cpu "-O3 -march=pentium4 -mtune=corei7-avx ${fpu} -msse -msse2 -mno-sse3")
 
 set(CFLAGS-OVERRIDE "" CACHE STRING "")
-- 
cgit v1.2.3