diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
| commit | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (patch) | |
| tree | 428493a138f0fdaebd4c915153f0dcdcbaedf76d /build | |
| parent | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (diff) | |
| parent | b64a1f46b930516927b1290c1d6771b491b84958 (diff) | |
| download | mv-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.gz mv-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.bz2 mv-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.xz mv-bcdf34645ff3067d3b4110120b6191af2b0b2e99.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'build')
| -rwxr-xr-x | build/bmakedebug | 3 | ||||
| -rwxr-xr-x | build/bmakemem (renamed from build/bmake) | 3 | ||||
| -rwxr-xr-x | build/bmakespeed | 2 | ||||
| -rwxr-xr-x | build/packevol | 2 | ||||
| -rwxr-xr-x | build/packtmw | 2 | ||||
| -rwxr-xr-x | build/packwin | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/build/bmakedebug b/build/bmakedebug index 2254234d0..521d88f68 100755 --- a/build/bmakedebug +++ b/build/bmakedebug @@ -35,7 +35,8 @@ export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ -Woverlength-strings -Wpedantic -Wsign-compare -Wsizeof-pointer-memaccess \ -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ --Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv" +-Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv \ +-fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmake b/build/bmakemem index 0e6761bb7..2ffea4030 100755 --- a/build/bmake +++ b/build/bmakemem @@ -34,7 +34,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -Woverlength-strings -Wpedantic -Wsign-compare -Wsizeof-pointer-memaccess \ -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ --Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable" +-Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \ +-fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmakespeed b/build/bmakespeed index 5f182c815..56a563247 100755 --- a/build/bmakespeed +++ b/build/bmakespeed @@ -13,7 +13,7 @@ export CXXFLAGS="-ggdb3 -O5 -pipe -ffast-math \ -funswitch-loops -pedantic -Wall \ -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ -funsafe-loop-optimizations -flto -fwhole-program \ --march=native" +-march=native -fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/packevol b/build/packevol index 464f241c0..60a4363cb 100755 --- a/build/packevol +++ b/build/packevol @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packtmw b/build/packtmw index bc75db779..c6c04f06c 100755 --- a/build/packtmw +++ b/build/packtmw @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ tmw.nsi diff --git a/build/packwin b/build/packwin index ba4cc5f87..10961c2de 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi |