- release 5

[packages/scummvm.git] / scummvm-wx-config.patch

diff --git a/scummvm-wx-config.patch b/scummvm-wx-config.patch
index ae4ef0bec5e9a9a10dd2abe143ef9eaa3823d0d5..1a4956b2fe163709ef4d66affc06bbe491c2cb0a 100644 (file)
--- a/scummvm-wx-config.patch
+++ b/scummvm-wx-config.patch
@@ -1,19 +1,11 @@
---- scummvm-0.12.0/scummvm-tools-0.12.0/Makefile~      2008-08-26 01:23:03.000000000 +0200
-+++ scummvm-0.12.0/scummvm-tools-0.12.0/Makefile       2008-12-26 11:38:58.571411354 +0100
-@@ -190,14 +190,14 @@
-       $(CXX) $(LDFLAGS) -o $@ $+
- 
- tools_gui$(EXEEXT): tools_gui.o
--      $(CXX) $(LDFLAGS) -o $@ $+ `wx-config --libs`
-+      $(CXX) $(LDFLAGS) -o $@ $+ `wx-gtk2-unicode-config --libs`
- 
- 
- clean:
-       rm -f *.o utils/*.o $(TARGETS)
- 
- tools_gui.o: tools_gui.cpp tools_gui.h
--      $(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c tools_gui.cpp -o tools_gui.o
-+      $(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-gtk2-unicode-config --cxxflags` -c tools_gui.cpp -o tools_gui.o
- 
- 
- ######################################################################
+--- scummvm-1.1.0/scummvm-tools-1.1.0/configure~       2010-04-02 19:55:43.000000000 +0200
++++ scummvm-1.1.0/scummvm-tools-1.1.0/configure        2010-04-20 12:46:30.628249474 +0200
+@@ -180,7 +180,7 @@
+ # TODO: small bit of code to test wxWidgets usability
+ find_wxconfig() {
+       echo_n "Looking for wx-config... "
+-      wxconfigs="$_wxconfig:wxgtk2-2.8-config"
++      wxconfigs="$_wxconfig:wx-gtk2-unicode-config"
+       _wxconfig=
+ 
+       IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"