From 09fcaf22dc924143e88c79c2539f48b33432bf1d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 17 Apr 2014 22:53:20 +0300 Subject: Change gcc in make scripts from 4.8 to 4.9. --- build/bmakedebug | 7 ++++--- build/bmakemem | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/bmakedebug b/build/bmakedebug index 521d88f68..9d99e473d 100755 --- a/build/bmakedebug +++ b/build/bmakedebug @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.8 -export CXX=g++-4.8 +export CC=gcc-4.9 +export CXX=g++-4.9 export LANG=C @@ -36,7 +36,8 @@ export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ -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 \ --fsched-pressure" +-fsched-pressure \ +-Wconditionally-supported -Wdate-time" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmakemem b/build/bmakemem index 2ffea4030..143362da0 100755 --- a/build/bmakemem +++ b/build/bmakemem @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.8 -export CXX=g++-4.8 +export CC=gcc-4.9 +export CXX=g++-4.9 export LANG=C @@ -35,7 +35,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -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" +-fsched-pressure \ +-Wconditionally-supported -Wdate-time" autoreconf -i ./configure --prefix=$dir/run \ -- cgit v1.2.3-70-g09d2 From ff6c93b16f408a2ef10e47a4168c59ab6c4fdafb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 Apr 2014 14:52:01 +0300 Subject: Fix compilation warnings. --- build/bmakedebug | 5 +++-- src/commands.cpp | 1 + src/commands.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/bmakedebug b/build/bmakedebug index 9d99e473d..8c3d43089 100755 --- a/build/bmakedebug +++ b/build/bmakedebug @@ -9,7 +9,7 @@ export CXX=g++-4.9 export LANG=C -export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ +export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fsanitize=address \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ @@ -37,7 +37,8 @@ export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv \ -fsched-pressure \ --Wconditionally-supported -Wdate-time" +-Wconditionally-supported -Wdate-time \ +-fno-var-tracking" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/src/commands.cpp b/src/commands.cpp index de4c03012..3d476f8c6 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -1136,6 +1136,7 @@ impHandler0(error) { const int *const ptr = nullptr; logger->log("test %d", *ptr); + exit(1); } impHandler(url) diff --git a/src/commands.h b/src/commands.h index 6dd688a17..a27f430db 100644 --- a/src/commands.h +++ b/src/commands.h @@ -107,7 +107,7 @@ namespace Commands decHandler(serverIgnoreAll); decHandler(serverUnIgnoreAll); decHandler(setDrop); - decHandler(error); + decHandler(error) __attribute__ ((noreturn)); decHandler(url); decHandler(open); decHandler(dump); -- cgit v1.2.3-70-g09d2 From 3e9346b5bae797139e6e992162a584ba5a4b0e8b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 26 Apr 2014 11:59:47 +0300 Subject: Change version to 1.4.4.26. --- ChangeLog | 6 ++++++ README | 2 +- README.txt | 2 +- build/packevol | 2 +- build/packtmw | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 8 files changed, 14 insertions(+), 8 deletions(-) (limited to 'build') diff --git a/ChangeLog b/ChangeLog index 18e91f09f..df2dfd29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-04-26 New release 1.4.4.26 +fix: crash with dragging empty spell. +fix: crash if open storage and start trade. +fix: links drawing over player head. +fix: downlod music option with incomplete configuration. + 2014-04-12 New release 1.4.4.12 fix: possible crash. fix: selection in dropdowns. diff --git a/README b/README index 4b189d02e..0df38ec58 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.4.12 Date: 2014-04-12 + Version: 1.4.4.26 Date: 2014-04-26 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index b3529373f..0b5162e55 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.4.12 Date: 2014-04-12 + Version: 1.4.4.26 Date: 2014-04-26 Development team: - See AUTHORS file for a list diff --git a/build/packevol b/build/packevol index 60a4363cb..6f5460d33 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.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packtmw b/build/packtmw index c6c04f06c..2163d7a41 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.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ tmw.nsi diff --git a/build/packwin b/build/packwin index 10961c2de..9e647ba64 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.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index d066deb51..baf164eae 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.4.4.12], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.4.4.26], [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 5c47e72ac..047b9c9a2 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.4.12" -#define CHECK_VERSION "01.04.04.12" +#define SMALL_VERSION "1.4.4.26" +#define CHECK_VERSION "01.04.04.26" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2