[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/builder b_globals.c,1.4,1.4.2.1 b_globals.h,1.5,1.5.2.1 enum_globals.h,1.6,1.6.2.1

Chris Apers chrilith at users.sourceforge.net
Mon Dec 20 10:50:20 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24572

Modified Files:
      Tag: branch-0-7-0
	b_globals.c b_globals.h enum_globals.h 
Log Message:
Cleanup

Index: b_globals.c
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/builder/b_globals.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- b_globals.c	9 Nov 2004 11:16:50 -0000	1.4
+++ b_globals.c	20 Dec 2004 18:49:40 -0000	1.4.2.1
@@ -5,34 +5,18 @@
 //#define BUILD_COMMON
 //#define BUILD_SIMON
 //#define BUILD_SCUMM
+#define BUILD_SKY
 //#define BUILD_QUEEN
-#define BUILD_SWORD1
+//#define BUILD_SWORD1
 
 #ifdef BUILD_COMMON
 #	define BUILD_RES	GBVARS_COMMON
 #	define BUILD_NAME	"Common"
-
-#elif defined(BUILD_SCUMM)
-#	define BUILD_RES	GBVARS_SCUMM
-#	define BUILD_NAME	"Scumm"
-
-#elif defined(BUILD_SIMON)
-#	define BUILD_RES	GBVARS_SIMON
-#	define BUILD_NAME	"Simon"
-
-#elif defined(BUILD_QUEEN)
-#	define BUILD_RES	GBVARS_QUEEN
-#	define BUILD_NAME	"Queen"
-
-#elif defined(BUILD_SWORD1)
-#	define BUILD_RES	GBVARS_SWORD1
-#	define BUILD_NAME	"Sword1"
-
 #else
-#	define BUILD_RES	-1
-#	define BUILD_NAME
-#	error No target defined.
+#	define BUILD_RES	GBVARS_ENGINE
+#	define BUILD_NAME	"Engine"
 #endif
+
 DmOpenRef dbP[GBVARS_COUNT];
 ///////////////////////////////////////////////////////////////////
 
@@ -81,6 +65,9 @@
 	addSimon();
 	Simon_addCharset();
 
+#elif defined(BUILD_SKY)
+	Sky_addHufftext();
+
 #elif defined(BUILD_QUEEN)
 	Queen_addTalk();
 	Queen_addRestables();

Index: b_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/builder/b_globals.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- b_globals.h	9 Nov 2004 11:16:50 -0000	1.5
+++ b_globals.h	20 Dec 2004 18:49:40 -0000	1.5.2.1
@@ -29,4 +29,6 @@
 void Queen_addDisplay();
 void Queen_addMusicdata();
 /////////////////////////////////
+void Sky_addHufftext();
+/////////////////////////////////
 void Sword1_addStaticres();

Index: enum_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/builder/enum_globals.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- enum_globals.h	9 Nov 2004 11:16:50 -0000	1.6
+++ enum_globals.h	20 Dec 2004 18:49:40 -0000	1.6.2.1
@@ -84,14 +84,15 @@
 
 enum {
 	GBVARS_COMMON = 0,
-	GBVARS_SCUMM,
-	GBVARS_SIMON,
-//	GBVARS_SKY,
-	GBVARS_SWORD1,
-//	GBVARS_SWORD2,
-	GBVARS_QUEEN,
-	GBVARS_SAGA,
-	
+	GBVARS_ENGINE = 1,
+	GBVARS_SCUMM = GBVARS_ENGINE,
+	GBVARS_SIMON = GBVARS_ENGINE,
+//	GBVARS_SKY = GBVARS_ENGINE,
+	GBVARS_SWORD1 = GBVARS_ENGINE,
+//	GBVARS_SWORD2 = GBVARS_ENGINE,
+	GBVARS_QUEEN = GBVARS_ENGINE,
+	GBVARS_SAGA = GBVARS_ENGINE,
+
 	GBVARS_COUNT
 };
 





More information about the Scummvm-git-logs mailing list