From c2e0cde213f3ed3d4ee2f4f8e5da8ed5a1e46573 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 25 Dec 2009 00:39:32 +0100 Subject: [PATCH] Win32 toolchain: various fixes + march=i686 In build_mingw32 script fixed path to Win32Toolchain.cmake. In this file set march=i686 and mtune=generic. --- build_mingw32 | 2 +- cmake/modules/Win32Toolchain.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build_mingw32 b/build_mingw32 index 3dd1f3726..b125afa93 100755 --- a/build_mingw32 +++ b/build_mingw32 @@ -1,4 +1,4 @@ MINGW=/opt/mingw32 export PATH=$PATH:$MINGW/bin -cmake .. -DCMAKE_TOOLCHAIN_FILE=cmake/modules/Win32Toolchain.cmake +cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake diff --git a/cmake/modules/Win32Toolchain.cmake b/cmake/modules/Win32Toolchain.cmake index 6d5030107..afdd54df5 100644 --- a/cmake/modules/Win32Toolchain.cmake +++ b/cmake/modules/Win32Toolchain.cmake @@ -36,6 +36,9 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(PKG_CONFIG_EXECUTABLE ${MINGW_PREFIX}/bin/pkg-config) +SET(CMAKE_C_FLAGS "-march=i686 -mtune=generic") +SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) + INCLUDE_DIRECTORIES(${MINGW_PREFIX}/include) LINK_DIRECTORIES(${MINGW_PREFIX}/lib ${MINGW_PREFIX}/bin)