[Scummvm-cvs-logs] SF.net SVN: scummvm: [27995] tools/branches/gsoc2007-toolsgui
lightcast at users.sourceforge.net
lightcast at users.sourceforge.net
Mon Jul 9 21:19:41 CEST 2007
Revision: 27995
http://scummvm.svn.sourceforge.net/scummvm/?rev=27995&view=rev
Author: lightcast
Date: 2007-07-09 12:19:41 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
Updated for building the tools GUI.
Modified Paths:
--------------
tools/branches/gsoc2007-toolsgui/Makefile
tools/branches/gsoc2007-toolsgui/Makefile.mingw
Modified: tools/branches/gsoc2007-toolsgui/Makefile
===================================================================
--- tools/branches/gsoc2007-toolsgui/Makefile 2007-07-09 19:19:01 UTC (rev 27994)
+++ tools/branches/gsoc2007-toolsgui/Makefile 2007-07-09 19:19:41 UTC (rev 27995)
@@ -38,7 +38,8 @@
extract_mm_nes$(EXEEXT) \
extract_parallaction$(EXEEXT) \
extract_scumm_mac$(EXEEXT) \
- extract_zak_c64$(EXEEXT)
+ extract_zak_c64$(EXEEXT) \
+ tools_gui$(EXEEXT)
UTILS := \
utils/adpcm.o \
@@ -118,6 +119,9 @@
extract_zak_c64$(EXEEXT): extract_zak_c64.o util.o
$(CC) $(LDFLAGS) -o $@ $+
+
+tools_gui$(EXEEXT): tools_gui.o
+ $(CXX) $(LDFLAGS) -o $@ $+ `wx-config --libs`
descumm.o descumm6.o descumm-common.o descumm-tool.o: descumm.h
@@ -155,6 +159,10 @@
clean:
rm -f *.o utils/*.o $(TARGETS)
+
+tools_gui.o: tools_gui.cpp tools_gui.h
+ $(CXX) $(CFLAGS) $(CPPFLAGS) `wx-config --cppflags` -c tools_gui.cpp -o tools_gui.o
+
.cpp.o:
$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
Modified: tools/branches/gsoc2007-toolsgui/Makefile.mingw
===================================================================
--- tools/branches/gsoc2007-toolsgui/Makefile.mingw 2007-07-09 19:19:01 UTC (rev 27994)
+++ tools/branches/gsoc2007-toolsgui/Makefile.mingw 2007-07-09 19:19:41 UTC (rev 27995)
@@ -34,6 +34,8 @@
strip extract_parallaction.exe -o $(SCUMMVMPATH)/tools/extract_parallaction.exe
strip extract_scumm_mac.exe -o $(SCUMMVMPATH)/tools/extract_scumm_mac.exe
strip extract_zak_c64.exe -o $(SCUMMVMPATH)/tools/extract_zak_c64.exe
+ strip tools_gui.exe -o $(SCUMMVMPATH)/tools/tools_gui.exe
+
cp *.bat $(SCUMMVMPATH)/tools
cp COPYING $(SCUMMVMPATH)/tools/COPYING.txt
cp README $(SCUMMVMPATH)/tools/README.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list