[Scummvm-cvs-logs] SF.net SVN: scummvm: [29012] scummvm/trunk/tools

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Sep 22 09:32:28 CEST 2007


Revision: 29012
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29012&view=rev
Author:   fingolfin
Date:     2007-09-22 00:32:28 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Added create_kyradat to our regular build system, too; fixed some warnings (and added a FIXME about ambiguious code)

Modified Paths:
--------------
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
    scummvm/trunk/tools/module.mk

Added Paths:
-----------
    scummvm/trunk/tools/create_kyradat/module.mk
    scummvm/trunk/tools/create_lure/module.mk

Property Changed:
----------------
    scummvm/trunk/tools/create_kyradat/
    scummvm/trunk/tools/create_lure/


Property changes on: scummvm/trunk/tools/create_kyradat
___________________________________________________________________
Name: svn:ignore
   + .deps
create_kyradat


Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2007-09-21 20:19:12 UTC (rev 29011)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2007-09-22 07:32:28 UTC (rev 29012)
@@ -58,7 +58,7 @@
 	{ kTypeRoomList, extractRooms, createFilename },
 	{ kTypeShapeList, extractShapes, createFilename },
 	{ kTypeRawData, extractRaw, createFilename },
-	{ -1, 0 }
+	{ -1, 0, 0}
 };
 
 const ExtractFilename extractFilenames[] = {
@@ -336,10 +336,16 @@
 					// We simply skip every other string
 					if (i == size)
 						continue;
-					uint32 size = strlen((const char*) data + i);
-					i += size; targetsize = --targetsize - size;
+					uint32 len = strlen((const char*) data + i);
+					i += len;
+#if 1
+					// FIXME: Not sure whether this correct; the original code was ambiguious, see below
+					targetsize = targetsize - 1 - len;
+#else
+					targetsize = --targetsize - len;	// FIXME: This operation is undefined
+#endif
 					while (!data[++i]) {
-						if (i == size)
+						if (i == len)
 							break;
 						targetsize--;
 					}
@@ -404,7 +410,7 @@
 	} else if (g->special == kAmigaVersion) {
 		// we need to strip some aligment zeros out here
 		int dstPos = 0;
-		for (int i = 0; i < size; ++i) {
+		for (uint32 i = 0; i < size; ++i) {
 			if (!data[i] && ((i+1) & 0x1))
 				continue;
 			*output++ = data[i];

Added: scummvm/trunk/tools/create_kyradat/module.mk
===================================================================
--- scummvm/trunk/tools/create_kyradat/module.mk	                        (rev 0)
+++ scummvm/trunk/tools/create_kyradat/module.mk	2007-09-22 07:32:28 UTC (rev 29012)
@@ -0,0 +1,16 @@
+MODULE := tools/create_kyradat
+
+MODULE_DIRS += \
+	tools/create_kyradat/
+
+TOOLS += \
+	$(MODULE)/create_kyradat$(EXEEXT)
+
+MODULE_OBJS := \
+	$(MODULE)/create_kyradat.o \
+	$(MODULE)/pak.o \
+	$(MODULE)/md5.o \
+	$(MODULE)/util.o
+
+$(MODULE)/create_kyradat$(EXEEXT): $(MODULE_OBJS)
+	$(CXX) $(LDFLAGS) $+ -o $@


Property changes on: scummvm/trunk/tools/create_kyradat/module.mk
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


Property changes on: scummvm/trunk/tools/create_lure
___________________________________________________________________
Name: svn:ignore
   + .deps
create_lure


Added: scummvm/trunk/tools/create_lure/module.mk
===================================================================
--- scummvm/trunk/tools/create_lure/module.mk	                        (rev 0)
+++ scummvm/trunk/tools/create_lure/module.mk	2007-09-22 07:32:28 UTC (rev 29012)
@@ -0,0 +1,14 @@
+MODULE := tools/create_lure
+
+MODULE_DIRS += \
+	tools/create_lure/
+
+TOOLS += \
+	$(MODULE)/create_lure$(EXEEXT)
+
+MODULE_OBJS := \
+	$(MODULE)/create_lure_dat.o \
+	$(MODULE)/process_actions.o
+
+$(MODULE)/create_lure$(EXEEXT): $(MODULE_OBJS)
+	$(CXX) $(LDFLAGS) $+ -o $@


Property changes on: scummvm/trunk/tools/create_lure/module.mk
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: scummvm/trunk/tools/module.mk
===================================================================
--- scummvm/trunk/tools/module.mk	2007-09-21 20:19:12 UTC (rev 29011)
+++ scummvm/trunk/tools/module.mk	2007-09-22 07:32:28 UTC (rev 29012)
@@ -10,9 +10,9 @@
 
 TOOLS := \
 	tools/convbdf$(EXEEXT) \
-	tools/md5table$(EXEEXT) \
-	tools/create_lure/create_lure$(EXEEXT)
+	tools/md5table$(EXEEXT)
 
+include $(srcdir)/tools/*/module.mk
 
 # Make sure the 'all' / 'clean' targets build/clean the tools, too
 all: tools
@@ -36,10 +36,6 @@
 	$(MKDIR) tools/$(DEPDIR)
 	$(CC) $(CFLAGS) -Wall -o $@ $<
 
-tools/create_lure/create_lure$(EXEEXT): tools/create_lure/create_lure_dat.o tools/create_lure/process_actions.o
-	$(MKDIR) tools/create_lure/$(DEPDIR)
-	$(CXX) $(LDFLAGS) $+ -o $@
-
 #
 # Rules to explicitly rebuild the credits / MD5 tables.
 # The rules for the files in the "web" resp. "docs" modules
@@ -79,5 +75,4 @@
 #	$(srcdir)/tools/credits.pl --cpp > $@
 
 
-
 .PHONY: clean-tools tools credits md5scumm md5simon


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