[Scummvm-cvs-logs] SF.net SVN: scummvm:[51439] tools/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Jul 29 00:01:19 CEST 2010
Revision: 51439
http://scummvm.svn.sourceforge.net/scummvm/?rev=51439&view=rev
Author: fingolfin
Date: 2010-07-28 22:01:19 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
TOOLS: Generate TARGETS from PROGRAMS; some fixes for sword2_clue
More work is needed to get sword2_clue to work again, in particular
it uses the old readUint32LE and readByte functions. Should be
switched to using the File class.
Also, USE_GTK should be set by configure if appropriate, for now
you need to do 'make USE_GTK=1' to compile sword2_clue.
Modified Paths:
--------------
tools/trunk/Makefile.common
tools/trunk/engines/sword2/sword2_clue.cpp
Modified: tools/trunk/Makefile.common
===================================================================
--- tools/trunk/Makefile.common 2010-07-28 21:55:40 UTC (rev 51438)
+++ tools/trunk/Makefile.common 2010-07-28 22:01:19 UTC (rev 51439)
@@ -49,30 +49,41 @@
#######################################################################
-TARGETS := \
- decine$(EXEEXT) \
- dekyra$(EXEEXT) \
- deriven$(EXEEXT) \
- descumm$(EXEEXT) \
- desword2$(EXEEXT) \
- extract_mohawk$(EXEEXT) \
- construct_mohawk$(EXEEXT) \
- degob$(EXEEXT) \
- gob_loadcalc$(EXEEXT) \
- scummvm-tools-cli$(EXEEXT)
+PROGRAMS = \
+ decine \
+ dekyra \
+ deriven \
+ descumm \
+ desword2 \
+ degob \
+ gob_loadcalc \
+ extract_mohawk \
+ construct_mohawk \
+ scummvm-tools-cli
+
ifdef USE_FREETYPE
ifdef USE_ICONV
-TARGETS += \
- create_sjisfnt$(EXEEXT)
+PROGRAMS += \
+ create_sjisfnt
endif
endif
ifdef USE_WXWIDGETS
-TARGETS += \
- scummvm-tools$(EXEEXT)
+PROGRAMS += \
+ scummvm-tools
endif
+# TODO: We don't currently set USE_GTK in configure, so the user would have
+# to manually specify it
+ifdef USE_GTK
+PROGRAMS += \
+ sword2_clue
+endif
+
+# Generate list of tool binaries
+TARGETS := $(addsuffix $(EXEEXT),$(PROGRAMS))
+
UTILS := \
common/file.o \
common/hashmap.o \
@@ -105,22 +116,7 @@
-PROGRAMS = \
- decine \
- dekyra \
- deriven \
- descumm \
- desword2 \
- degob \
- gob_loadcalc \
- extract_mohawk \
- construct_mohawk \
- create_sjisfnt \
- scummvm-tools \
- scummvm-tools-cli \
- sword2_clue
-
decine_OBJS := engines/cine/decine.o
dekyra_OBJS := \
@@ -194,7 +190,7 @@
sword2_clue_OBJS := engines/sword2/sword2_clue.o
sword2_clue_LIBS := `pkg-config --libs gtk+-2.0`
# Set custom build flags
-sword2_clue.o: CPPFLAGS+=`pkg-config --cflags gtk+-2.0`
+engines/sword2/sword2_clue.o: CPPFLAGS+=`pkg-config --cflags gtk+-2.0`
tools_OBJS := \
Modified: tools/trunk/engines/sword2/sword2_clue.cpp
===================================================================
--- tools/trunk/engines/sword2/sword2_clue.cpp 2010-07-28 21:55:40 UTC (rev 51438)
+++ tools/trunk/engines/sword2/sword2_clue.cpp 2010-07-28 22:01:19 UTC (rev 51439)
@@ -21,10 +21,10 @@
*
*/
+#include "common/util.h"
+
#include <gtk/gtk.h>
-#include "util.h"
-
// The following cluster files are - to some extent - understood:
//
// carib1.clu
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