]>
Commit | Line | Data |
---|---|---|
46065ef6 JR |
1 | --- scummvm-1.0.0rc1/scummvm-tools-1.0.0/Makefile 2009-09-30 11:45:38.477143239 +0200 |
2 | +++ scummvm-1.0.0rc1/scummvm-tools-1.0.0/Makefile~ 2009-08-23 15:44:34.000000000 +0200 | |
949e7817 JR |
3 | @@ -212,7 +212,7 @@ |
4 | $(CXX) $(LDFLAGS) `freetype-config --libs` -o $@ $+ | |
ed6c522d AG |
5 | |
6 | tools_gui$(EXEEXT): tools_gui.o | |
7 | - $(CXX) $(LDFLAGS) -o $@ $+ `wx-config --libs` | |
8 | + $(CXX) $(LDFLAGS) -o $@ $+ `wx-gtk2-unicode-config --libs` | |
9 | ||
949e7817 JR |
10 | sword2_clue$(EXEEXT): sword2_clue.o util.o |
11 | $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs gtk+-2.0` | |
12 | @@ -224,7 +224,7 @@ | |
13 | $(CXX) $(CXXFLAGS) $(CPPFLAGS) `freetype-config --cflags` -c create_sjisfnt.cpp -o create_sjisfnt.o | |
ed6c522d AG |
14 | |
15 | tools_gui.o: tools_gui.cpp tools_gui.h | |
16 | - $(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c tools_gui.cpp -o tools_gui.o | |
17 | + $(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-gtk2-unicode-config --cxxflags` -c tools_gui.cpp -o tools_gui.o | |
18 | ||
949e7817 JR |
19 | sword2_clue.o: sword2_clue.cpp |
20 | $(CXX) $(CXXFLAGS) $(CPPFLAGS) `pkg-config --cflags gtk+-2.0` -c sword2_clue.cpp |