[Scummvm-cvs-logs] SF.net SVN: scummvm:[46447] tools/branches/gsoc2009-gui

[sev at users.sourceforge.net]

Revision: 46447
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46447&view=rev
Author:   sev
Date:     2009-12-20 22:16:29 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
Optimized compiler flags for wxWidgets

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile
    tools/branches/gsoc2009-gui/configure

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-12-20 22:02:05 UTC (rev 46446)
+++ tools/branches/gsoc2009-gui/Makefile	2009-12-20 22:16:29 UTC (rev 46447)
@@ -126,7 +126,7 @@
 	extract_agos.o extract_cine.o extract_gob_stk.o extract_kyra.o extract_loom_tg16.o extract_mm_apple.o \
 	extract_mm_c64.o extract_mm_nes.o extract_parallaction.o extract_scumm_mac.o extract_t7g_mac.o \
 	encode_dxa.o extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o tool.o tools.o $(UTILS)
-	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $+ $(WXLIBS) $(LIBS)
 
 tools_cli$(EXEEXT): main_cli.o tools_cli.o compress_agos.o compress_gob.o compress_kyra.o \
 	compress_queen.o compress_saga.o compress_scumm_bun.o compress_scumm_san.o compress_scumm_sou.o \
@@ -134,25 +134,25 @@
 	extract_agos.o extract_cine.o extract_gob_stk.o extract_kyra.o extract_loom_tg16.o extract_mm_apple.o \
 	extract_mm_c64.o extract_mm_nes.o extract_parallaction.o extract_scumm_mac.o extract_t7g_mac.o \
 	encode_dxa.o extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o tool.o tools.o $(UTILS)
-	$(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
+	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS) -lpng
 
 sword2_clue$(EXEEXT): sword2_clue.o
 	$(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs gtk+-2.0`
 
 gui/main.o: gui/main.cpp gui/main.h gui/configuration.h gui/pages.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c gui/main.cpp -o gui/main.o
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(WXINCLUDES) -c gui/main.cpp -o gui/main.o
 
 gui/pages.o: gui/pages.cpp gui/pages.h gui/main.h gui/gui_tools.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c gui/pages.cpp -o gui/pages.o
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(WXINCLUDES) -c gui/pages.cpp -o gui/pages.o
 
 create_sjisfnt.o: create_sjisfnt.cpp util.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `freetype-config --cflags` -c create_sjisfnt.cpp -o create_sjisfnt.o
 
 tools_gui.o: tools_gui.cpp tools_gui.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c tools_gui.cpp -o tools_gui.o
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(WXINCLUDES) -c tools_gui.cpp -o tools_gui.o
 
 gui/gui_tools.o: gui/gui_tools.cpp gui/gui_tools.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c gui/gui_tools.cpp -o gui/gui_tools.o
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(WXINCLUDES) -c gui/gui_tools.cpp -o gui/gui_tools.o
 
 sword2_clue.o: sword2_clue.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `pkg-config --cflags gtk+-2.0` -c sword2_clue.cpp

Modified: tools/branches/gsoc2009-gui/configure
===================================================================
--- tools/branches/gsoc2009-gui/configure	2009-12-20 22:02:05 UTC (rev 46446)
+++ tools/branches/gsoc2009-gui/configure	2009-12-20 22:16:29 UTC (rev 46447)
@@ -83,6 +83,8 @@
 _wxconfig=wx-config
 _wxpath="$PATH"
 _prefix=/usr/local
+_wxincludes=""
+_wxlibs=""
 
 _srcdir=`dirname $0`
 
@@ -883,9 +885,12 @@
 
 
 find_wxconfig
-INCLUDES="$INCLUDES `$_wxconfig --prefix="$_wxpath" --cflags`"
-LIBS="$LIBS `$_wxconfig --prefix="$_wxpath" --libs`"
+if test -n "$_wxconfig"; then
+	_wxincludes="`$_wxconfig --prefix="$_wxpath" --cflags`"
+	_wxlibs="`$_wxconfig --prefix="$_wxpath" --libs`"
+fi
 
+
 #
 # Do CXXFLAGS now we know the compiler version
 #
@@ -984,6 +989,9 @@
 DEFINES += $DEFINES
 LDFLAGS += $LDFLAGS
 
+WXINCLUDES := $_wxincludes
+WXLIBS:= $_wxlibs
+
 SAVED_CONFIGFLAGS  := $SAVED_CONFIGFLAGS
 SAVED_LDFLAGS      := $SAVED_LDFLAGS
 SAVED_CXX          := $SAVED_CXX


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.