[Scummvm-cvs-logs] SF.net SVN: scummvm:[35985] scummvm/trunk/backends

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Wed Jan 21 20:29:03 CET 2009


Revision: 35985
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35985&view=rev
Author:   dhewg
Date:     2009-01-21 19:29:02 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
made ISO9660 support optional via USE_WII_DI

Modified Paths:
--------------
    scummvm/trunk/backends/fs/wii/wii-fs.cpp
    scummvm/trunk/backends/platform/wii/Makefile
    scummvm/trunk/backends/platform/wii/main.cpp

Modified: scummvm/trunk/backends/fs/wii/wii-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/wii/wii-fs.cpp	2009-01-21 19:11:47 UTC (rev 35984)
+++ scummvm/trunk/backends/fs/wii/wii-fs.cpp	2009-01-21 19:29:02 UTC (rev 35985)
@@ -33,7 +33,7 @@
 
 #include <gctypes.h>
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 #include <di/di.h>
 #endif
 
@@ -86,7 +86,7 @@
 };
 
 void WiiFilesystemNode::asyncHandler(bool mount, const Common::String *path) {
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	static bool di_tryMount = true;
 	static bool di_isMounted = false;
 

Modified: scummvm/trunk/backends/platform/wii/Makefile
===================================================================
--- scummvm/trunk/backends/platform/wii/Makefile	2009-01-21 19:11:47 UTC (rev 35984)
+++ scummvm/trunk/backends/platform/wii/Makefile	2009-01-21 19:29:02 UTC (rev 35985)
@@ -14,6 +14,14 @@
 # Builds a Gamecube version. Cleanup object files before flipping this!
 GAMECUBE = 0
 
+# Enable DVD ISO9660/Joliet support using libdi (included in libogc)
+# This requires a working DVDX install to function, not available on Gamecube
+ifeq ($(GAMECUBE),1)
+USE_WII_DI = 0
+else
+USE_WII_DI = 1
+endif
+
 # List of game engines to compile in. Comment a to disable the engine.
 ENABLE_SCUMM = STATIC_PLUGIN
 ENABLE_SCUMM_7_8 = STATIC_PLUGIN
@@ -130,6 +138,10 @@
 LIBS     += -ldb
 endif
 
+ifeq ($(USE_WII_DI),1)
+CXXFLAGS += -DUSE_WII_DI
+endif
+
 ifeq ($(USE_ZLIB),1)
 CXXFLAGS += -DUSE_ZLIB
 LIBS     += -lz

Modified: scummvm/trunk/backends/platform/wii/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/main.cpp	2009-01-21 19:11:47 UTC (rev 35984)
+++ scummvm/trunk/backends/platform/wii/main.cpp	2009-01-21 19:29:02 UTC (rev 35985)
@@ -27,7 +27,7 @@
 #include <ogc/machine/processor.h>
 #include <fat.h>
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 #include <di/di.h>
 #endif
 
@@ -83,7 +83,7 @@
 int main(int argc, char *argv[]) {
 	s32 res;
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	DI_Init();
 #endif
 
@@ -110,7 +110,7 @@
 	SYS_SetPowerCallback(power_cb);
 #endif
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	// initial async mount for the browser, see wii-fs.cpp
 	DI_Mount();
 #endif
@@ -149,7 +149,7 @@
 	fatUnmountDefault();
 #endif
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	DI_Close();
 #endif
 


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