[Scummvm-cvs-logs] SF.net SVN: scummvm: [21799] scummvm/trunk/backends/PalmOS/Src

[chrilith at users.sourceforge.net]

Revision: 21799
Author:   chrilith
Date:     2006-04-11 11:08:51 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21799&view=rev

Log Message:
-----------
Added now required palm_main(...) function

Modified Paths:
--------------
    scummvm/trunk/backends/PalmOS/Src/modules.cpp
    scummvm/trunk/backends/PalmOS/Src/native/zodiacARM.cpp
Modified: scummvm/trunk/backends/PalmOS/Src/modules.cpp
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/modules.cpp	2006-04-11 18:06:22 UTC (rev 21798)
+++ scummvm/trunk/backends/PalmOS/Src/modules.cpp	2006-04-11 18:08:51 UTC (rev 21799)
@@ -91,6 +91,31 @@
 
 #else
 
+#include "stdafx.h"
+#include "base/main.h"
+#include "be_zodiac.h"
+#include "be_os5ex.h"
+
+static void palm_main(int argc, char **argvP)  {
+#ifdef COMPILE_OS5
+	if (gVars->advancedMode)
+		g_system = new OSystem_PalmOS5Ex();
+	else
+		g_system = new OSystem_PalmOS5();
+#elif defined(COMPILE_ZODIAC)
+	g_system = new OSystem_PalmZodiac();
+#else
+	#error "No target defined."
+#endif
+
+	assert(g_system);
+
+	// Invoke the actual ScummVM main entry point:
+	scummvm_main(argc, argvP);
+
+	g_system->quit();	// TODO: Consider removing / replacing this!
+}
+
 void run(int argc, char *argv[]) {
 
 	MathlibInit();
@@ -119,7 +144,7 @@
 	// be sure to have a VG
 	void *__ptr = StuffsForceVG();
 
-	DO_EXIT( main(argc, argv); )
+	DO_EXIT( palm_main(argc, argv); )
 
 	// be sure to release features memory
 	FREE_FTR(ftrBufferOverlay)

Modified: scummvm/trunk/backends/PalmOS/Src/native/zodiacARM.cpp
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/native/zodiacARM.cpp	2006-04-11 18:06:22 UTC (rev 21798)
+++ scummvm/trunk/backends/PalmOS/Src/native/zodiacARM.cpp	2006-04-11 18:08:51 UTC (rev 21799)
@@ -37,10 +37,41 @@
 #include <AdnDebugMgr.h>
 //#define DEBUG_ARM
 
+#include "stdafx.h"
+#include "base/main.h"
+#include "be_zodiac.h"
+#include "be_os5ex.h"
+
 GlobalsDataType g_vars;
 GlobalsDataPtr gVars = &g_vars;
 UInt32 g_stackSize;
 
+static void palm_main(int argc, char **argvP)  {
+#ifdef COMPILE_OS5
+	if (gVars->advancedMode)
+		g_system = new OSystem_PalmOS5Ex();
+	else
+		g_system = new OSystem_PalmOS5();
+#elif defined(COMPILE_ZODIAC)
+	g_system = new OSystem_PalmZodiac();
+#else
+	#error "No target defined."
+#endif
+
+	assert(g_system);
+
+	// Invoke the actual ScummVM main entry point:
+	extern void initGlobalHashes();
+	initGlobalHashes();
+
+	scummvm_main(argc, argvP);
+
+	extern void freeGlobalHashes();
+	freeGlobalHashes();
+
+	g_system->quit();	// TODO: Consider removing / replacing this!
+}
+
 static void Go() {
 	void *tmp;
 	char **argvP;
@@ -76,8 +107,7 @@
 	if (HWR_INIT(INIT_VIBRATOR))	gVars->vibrator =	RumbleInit();
 
 	// run ...
-	extern int main(int, char **);
-	DO_EXIT ( main(argc, argvP); )	
+	DO_EXIT ( palm_main(argc, argvP); )	
 
 	// release 
 	if (HWR_INIT(INIT_VIBRATOR))	RumbleRelease();


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