From f73819c8e075b0925381052590a5ac9ec6ac1b68 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 6 Apr 2014 21:40:01 +0300 Subject: Add optimisation flag into make scripts. --- build/bmake | 3 ++- build/bmakedebug | 3 ++- build/bmakespeed | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/bmake b/build/bmake index 0e6761bb7..2ffea4030 100755 --- a/build/bmake +++ b/build/bmake @@ -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/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/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 \ -- cgit v1.2.3-70-g09d2 From a50ecdf6045ba0f0d5e91d10ddeb8d5520ba55cb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 9 Apr 2014 19:47:18 +0300 Subject: rename bmake script into bmakemem. --- build/bmake | 55 ------------------------------------------------------- build/bmakemem | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) delete mode 100755 build/bmake create mode 100755 build/bmakemem (limited to 'build') diff --git a/build/bmake b/build/bmake deleted file mode 100755 index 2ffea4030..000000000 --- a/build/bmake +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -cd .. - -dir=`pwd` - -export CC=gcc-4.8 -export CXX=g++-4.8 - -export LANG=C - -export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ --funswitch-loops \ --Wvariadic-macros -Wvla -Wredundant-decls \ --Wpacked-bitfield-compat -Wtrampolines \ --Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ --fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ --Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ --Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ --Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ --Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ --Wcast-align -Wpointer-arith -Wundef \ --Wmissing-include-dirs -Winit-self -pedantic -Wall \ --Wpacked -Wextra -fstrict-overflow -Wstrict-overflow=1 -Wunknown-pragmas \ --Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ --Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ --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 -Wfree-nonheap-object -Winvalid-memory-model \ --Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ --Wabi-tag -Waggressive-loop-optimizations -Wclobbered -Wempty-body \ --Wignored-qualifiers -Wliteral-suffix -Wmissing-field-initializers \ --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 \ --fsched-pressure" - -autoreconf -i -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-eathena=yes - -cd po -make -j8 update-gmo 2>../build/make1.log -cd .. -make -j8 2>build/make2.log - diff --git a/build/bmakemem b/build/bmakemem new file mode 100755 index 000000000..2ffea4030 --- /dev/null +++ b/build/bmakemem @@ -0,0 +1,55 @@ +#!/bin/sh + +cd .. + +dir=`pwd` + +export CC=gcc-4.8 +export CXX=g++-4.8 + +export LANG=C + +export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ +-funswitch-loops \ +-Wvariadic-macros -Wvla -Wredundant-decls \ +-Wpacked-bitfield-compat -Wtrampolines \ +-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ +-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \ +-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ +-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ +-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ +-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ +-Wcast-align -Wpointer-arith -Wundef \ +-Wmissing-include-dirs -Winit-self -pedantic -Wall \ +-Wpacked -Wextra -fstrict-overflow -Wstrict-overflow=1 -Wunknown-pragmas \ +-Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ +-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 -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ +-Wabi-tag -Waggressive-loop-optimizations -Wclobbered -Wempty-body \ +-Wignored-qualifiers -Wliteral-suffix -Wmissing-field-initializers \ +-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 \ +-fsched-pressure" + +autoreconf -i +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-eathena=yes + +cd po +make -j8 update-gmo 2>../build/make1.log +cd .. +make -j8 2>build/make2.log + -- cgit v1.2.3-70-g09d2 From 1e6aaba78af4a2330ea02b7ad191de021775bc06 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 12 Apr 2014 15:40:59 +0300 Subject: Change version to 1.4.4.12 --- ChangeLog | 8 ++++++++ README | 2 +- README.txt | 2 +- build/packevol | 2 +- build/packtmw | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 8 files changed, 16 insertions(+), 8 deletions(-) (limited to 'build') diff --git a/ChangeLog b/ChangeLog index 7b83befbf..18e91f09f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-04-12 New release 1.4.4.12 +fix: possible crash. +fix: selection in dropdowns. +fix: redraw graphics on game window resize. +add: improve online list update speed. +add: slider step in char creation dialog. +add: improved gui draw speed. + 2014-03-29 New release 1.4.3.29 fix: memory leak on window resize. fix: crash with map layer patches. diff --git a/README b/README index 763b5693c..4b189d02e 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.3.29 Date: 2014-03-29 + Version: 1.4.4.12 Date: 2014-04-12 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 652fc44c2..b3529373f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.3.29 Date: 2014-03-29 + Version: 1.4.4.12 Date: 2014-04-12 Development team: - See AUTHORS file for a list 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 diff --git a/configure.ac b/configure.ac index 47680404f..d066deb51 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.4.3.29], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.4.4.12], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 60ecfb981..5c47e72ac 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.4.3.29" -#define CHECK_VERSION "01.04.03.29" +#define SMALL_VERSION "1.4.4.12" +#define CHECK_VERSION "01.04.04.12" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2