diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-04-06 15:23:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-04-06 19:13:56 +0300 |
| commit | 8746e07ec7c6506446d8ad506ca24cd727483d03 (patch) | |
| tree | cbaf185e5ff02e5f4f043d68ab6d780428cdb653 | |
| parent | 00eaa9e7f3c1a5c1248d919a74f7784d716d58a0 (diff) | |
| download | manaplus-8746e07ec7c6506446d8ad506ca24cd727483d03.tar.gz manaplus-8746e07ec7c6506446d8ad506ca24cd727483d03.tar.bz2 manaplus-8746e07ec7c6506446d8ad506ca24cd727483d03.tar.xz manaplus-8746e07ec7c6506446d8ad506ca24cd727483d03.zip | |
Changed build options in nightly scripts.
| -rwxr-xr-x | nightly/buildlinux.sh | 1 | ||||
| -rwxr-xr-x | nightly/buildwindows.sh | 2 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 4 | ||||
| -rw-r--r-- | toolchain.nightly | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/nightly/buildlinux.sh b/nightly/buildlinux.sh index 43eb06883..4fcc828f2 100755 --- a/nightly/buildlinux.sh +++ b/nightly/buildlinux.sh @@ -4,6 +4,7 @@ cd .. DSTDIR=packaging/build/linux +export CXXFLAGS="-Wall -g0 -O3" autoreconf -i #make clean ./configure --enable-portable=yes diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh index 286471d4c..ecd7a35f9 100755 --- a/nightly/buildwindows.sh +++ b/nightly/buildwindows.sh @@ -4,7 +4,7 @@ dir=`pwd` cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly . +CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly . result=$? if [ "$result" != 0 ]; then exit $result diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 43c152542..7f30702bc 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -283,9 +283,9 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files." !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts." - !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music. (If selected the music will be downloaded from the internet.)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" - !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface into 23 different languages. Uncheck this component to leave it in English." + !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." !insertmacro MUI_FUNCTION_DESCRIPTION_END diff --git a/toolchain.nightly b/toolchain.nightly index d92a292ba..0f1ac8d25 100644 --- a/toolchain.nightly +++ b/toolchain.nightly @@ -12,7 +12,7 @@ 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 Release) SET(SDLIMAGE_INCLUDE_DIR ./packaging/windows/libs/include/SDL) SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL) |