Merge branch 'master' into strippedstripped1.1.10.16

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf

1 files changed, 60 insertions, 0 deletions

diff --git a/build/bmake b/build/bmake
new file mode 100755
index 000000000..a8f55ca62
--- /dev/null
+++ b/build/bmake
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+cd ..
+
+#may be
+#-Waggregate-return -Winline 
+
+#for feature
+#-Wstrict-overflow=4 -Wfloat-equal
+#-Wunsafe-loop-optimizations
+#-Wnon-virtual-dtor
+#-Woverloaded-virtual
+#-Wformat=2
+#-Wswitch-enum
+
+#for better code
+# -Weffc++
+
+#need fix: -Wold-style-cast -Wconversion
+#prof -pg
+
+dir=`pwd`
+
+export CC=gcc-4.5
+export CXX=g++-4.5
+
+export LANG=C
+export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-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 \
+-Wunused-parameter -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
+-Wpacked -Wshadow -Wunused -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"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no
+
+#--enable-applebuild=yes
+#--without-librt
+
+cd po
+#make -j5 update-po 2>../make1.log
+make -j5 update-gmo 2>../build/make1.log
+cd ..
+make -j5 2>build/make2.log
+