diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
| commit | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (patch) | |
| tree | 152c7519b0d9b8fb424af2373ec48db823a85575 /bmake | |
| parent | 62ec17f6e489ec50f17219444468aeb8969dc961 (diff) | |
| parent | 3b999f51c740d0541c53d223518e5e4bb482d996 (diff) | |
| download | manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.gz manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.bz2 manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.xz manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.zip | |
Merge branch 'master' into strippedstripped1.1.9.18
Conflicts:
src/guichan/cliprectangle.cpp
src/guichan/focushandler.cpp
src/guichan/gui.cpp
src/guichan/include/guichan/cliprectangle.hpp
src/guichan/include/guichan/inputevent.hpp
src/guichan/include/guichan/keyevent.hpp
src/guichan/include/guichan/mouseevent.hpp
src/guichan/include/guichan/widgets/button.hpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/include/guichan/widgets/radiobutton.hpp
src/guichan/include/guichan/widgets/slider.hpp
src/guichan/include/guichan/widgets/tab.hpp
src/guichan/include/guichan/widgets/tabbedarea.hpp
src/guichan/include/guichan/widgets/textfield.hpp
src/guichan/include/guichan/widgets/window.hpp
src/guichan/inputevent.cpp
src/guichan/keyevent.cpp
src/guichan/mouseevent.cpp
src/guichan/widget.cpp
src/guichan/widgets/button.cpp
src/guichan/widgets/checkbox.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/radiobutton.cpp
src/guichan/widgets/slider.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textfield.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'bmake')
| -rwxr-xr-x | bmake | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ #!/bin/sh #may be -#-Wshadow -Waggregate-return -Winline +#-Waggregate-return -Winline #for feature #-Wstrict-overflow=4 -Wfloat-equal @@ -33,7 +33,7 @@ export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ -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" +-Wpacked -Wshadow -D_FORTIFY_SOURCE=2" autoreconf -i ./configure --prefix=$dir/run \ |