From e94378511e1bf3cc56318341d24776db817bf3e5 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Wed, 21 Jan 2009 19:29:02 +0000
Subject: made ISO9660 support optional via USE_WII_DI

svn-id: r35985
---
 backends/platform/wii/Makefile | 12 ++++++++++++
 backends/platform/wii/main.cpp |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/wii/Makefile b/backends/platform/wii/Makefile
index 66f16317ae..6b539a616e 100644
--- a/backends/platform/wii/Makefile
+++ b/backends/platform/wii/Makefile
@@ -14,6 +14,14 @@ DEBUG_WII_GDB = 0
 # 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 @@ CXXFLAGS += -DDEBUG_WII_GDB
 LIBS     += -ldb
 endif
 
+ifeq ($(USE_WII_DI),1)
+CXXFLAGS += -DUSE_WII_DI
+endif
+
 ifeq ($(USE_ZLIB),1)
 CXXFLAGS += -DUSE_ZLIB
 LIBS     += -lz
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index 3c53039ea2..1182ddd31b 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -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 @@ void wii_memstats(void) {
 int main(int argc, char *argv[]) {
 	s32 res;
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	DI_Init();
 #endif
 
@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
 	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 @@ int main(int argc, char *argv[]) {
 	fatUnmountDefault();
 #endif
 
-#ifndef GAMECUBE
+#ifdef USE_WII_DI
 	DI_Close();
 #endif
 
-- 
cgit v1.2.3