diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-11 20:24:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-12 01:46:27 +0300 |
| commit | 64e746127640a22e36d8ec98f33a64032a1dd1dc (patch) | |
| tree | ff5f9f69cc4fc80b1461e7ad9a60d15c7c6e721c | |
| parent | dc53f8b7f360a489bd10355131339809d66378ef (diff) | |
| download | plus-64e746127640a22e36d8ec98f33a64032a1dd1dc.tar.gz plus-64e746127640a22e36d8ec98f33a64032a1dd1dc.tar.bz2 plus-64e746127640a22e36d8ec98f33a64032a1dd1dc.tar.xz plus-64e746127640a22e36d8ec98f33a64032a1dd1dc.zip | |
Fix cmake build file.
| -rwxr-xr-x | build/bcmake | 5 | ||||
| -rw-r--r-- | build/toolchain.cmake | 4 | ||||
| -rw-r--r-- | build/toolchain.nightly | 4 | ||||
| -rwxr-xr-x | nightly/buildwindows.sh | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 11 |
5 files changed, 11 insertions, 16 deletions
diff --git a/build/bcmake b/build/bcmake index 21de1da77..ab6dce6a1 100755 --- a/build/bcmake +++ b/build/bcmake @@ -3,7 +3,8 @@ cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log +export CXXFLAGS="-Wall -g0 -O3" +cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log -make -j5 2>build/make.log +make -j5 VERBOSE=1 2>build/make.log diff --git a/build/toolchain.cmake b/build/toolchain.cmake index c8493c0c5..92415eb1e 100644 --- a/build/toolchain.cmake +++ b/build/toolchain.cmake @@ -12,7 +12,9 @@ SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) SET(CMAKE_INSTALL_PREFIX ./win) -SET(CMAKE_BUILD_TYPE RelWithDebInfo) +SET(CMAKE_BUILD_TYPE None) +SET(CMAKE_C_FLAGS -O3 -Wall) +SET(CMAKE_CXX_FLAGS -O3 -Wall) SET(SDLIMAGE_INCLUDE_DIR ../mana_win/libs/include/SDL) SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL) diff --git a/build/toolchain.nightly b/build/toolchain.nightly index 6093a82f8..564732897 100644 --- a/build/toolchain.nightly +++ b/build/toolchain.nightly @@ -12,7 +12,9 @@ SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) SET(CMAKE_INSTALL_PREFIX ./win) -SET(CMAKE_BUILD_TYPE Release) +SET(CMAKE_BUILD_TYPE None) +SET(CMAKE_C_FLAGS -O3 -Wall) +SET(CMAKE_CXX_FLAGS -O3 -Wall) SET(SDLIMAGE_INCLUDE_DIR ./packaging/windows/libs/include/SDL) SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL) diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh index 3cb9d6607..1d0acabf8 100755 --- a/nightly/buildwindows.sh +++ b/nightly/buildwindows.sh @@ -4,7 +4,8 @@ dir=`pwd` cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./build/toolchain.nightly . +export CXXFLAGS="-Wall -g0 -O3" +cmake -DCMAKE_TOOLCHAIN_FILE=./build/toolchain.nightly . result=$? if [ "$result" != 0 ]; then exit $result diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c60196e0..222728ca8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,17 +10,6 @@ FIND_PACKAGE(PhysFS REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(Gettext REQUIRED) -IF (CMAKE_COMPILER_IS_GNUCXX) - # Help getting compilation warnings - SET(CMAKE_CXX_FLAGS "-Wall") - IF (WIN32) - # This includes enough debug information to get something useful - # from Dr. Mingw while keeping binary size down. Almost useless - # with gdb, though. - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -ggdb0 -gstabs2") - ENDIF() -ENDIF() - IF (POLICY CMP0015) CMAKE_POLICY(SET CMP0015 OLD) ENDIF() |