diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/bmakesnapshot | 7 | ||||
| -rwxr-xr-x | build/packwin | 2 | ||||
| -rwxr-xr-x | build/pmake | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/build/bmakesnapshot b/build/bmakesnapshot index 4736fb8a5..89f465251 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -2,8 +2,6 @@ cd .. -#need fix: -Wzero-as-null-pointer-constant - dir=`pwd` export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -23,12 +21,13 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ -Wcast-align -Wpointer-arith -Wundef \ -Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ -Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ --Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \ +-Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ -Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ --Wvector-operation-performance" +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/packwin b/build/packwin index 077104227..d855cf534 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.12.11" \ + -DPRODUCT_VERSION="1.2.1.22" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/build/pmake b/build/pmake index 7ad12eaec..b51e40734 100755 --- a/build/pmake +++ b/build/pmake @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.5 -export CXX=g++-4.5 +export CC=gcc-4.6 +export CXX=g++-4.6 #-D_GLIBCXX_PROFILE |