From 1513b0c43746bd90fb558fc3412475c04f969091 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 25 Jul 2010 19:22:28 +0200 Subject: [PATCH] Win32Toolchain: define CFLAGS/CXXFLAGS in top level build_mingw32 script All flags which are used now for building Win32 version of LMMS are now defined in the top level build_mingw32 script instead of the Win32Toolchain cmake files. --- build_mingw32 | 2 ++ cmake/modules/Win32Toolchain.cmake | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build_mingw32 b/build_mingw32 index 46b86bb13..347550416 100755 --- a/build_mingw32 +++ b/build_mingw32 @@ -1,4 +1,6 @@ MINGW=/opt/mingw32 export PATH=$PATH:$MINGW/bin +export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize" +export CXXFLAGS="$CFLAGS" cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ diff --git a/cmake/modules/Win32Toolchain.cmake b/cmake/modules/Win32Toolchain.cmake index 84ebb4b92..3fd2612ac 100644 --- a/cmake/modules/Win32Toolchain.cmake +++ b/cmake/modules/Win32Toolchain.cmake @@ -2,9 +2,5 @@ SET(MINGW_PREFIX /opt/mingw32) SET(CMAKE_SYSTEM_PROCESSOR i686) -SET(CMAKE_C_FLAGS "-march=i686 -mtune=generic") -SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) - - INCLUDE(MinGWCrossCompile)