From 023b16ee9cc73c6a582f050c78f2cc0c3c622ac7 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 13 Nov 2012 19:39:56 +0000
Subject: [PATCH] mednafen-conditional compile cd interfaces

---
 mednafen/config.h              | 22 -----------------
 mednafen/headless/headless.h   |  5 ++++
 mednafen/libmednahawk/config.h |  2 +-
 mednafen/src/mednafen.cpp      | 43 +++++++++++++++++++++-------------
 4 files changed, 33 insertions(+), 39 deletions(-)
 delete mode 100644 mednafen/config.h

diff --git a/mednafen/config.h b/mednafen/config.h
deleted file mode 100644
index 7a332d56da..0000000000
--- a/mednafen/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//win32 msvc config
-#pragma once
-#define HAVE__MKDIR 1
-#define LSB_FIRST
-#define SIZEOF_DOUBLE 8
-#define WANT_DEBUGGER 1
-#define snprintf _snprintf
-#define strcasecmp(x,y) _stricmp(x,y)
-#define strncasecmp(x, y, l) strnicmp(x, y, l)
-#define _(x) (x)
-#define PSS "/"
-#define round(x) (floorf((x) + 0.5f))
-#define strdup _strdup
-#define strtoull _strtoui64
-#define strtoll _strtoi64
-#define _USE_MATH_DEFINES
-#define world_strtod strtod
-#define WANT_PSX_EMU
-
-
-#define MEDNAFEN_VERSION "0.999.999-WIP"
-#define MEDNAFEN_VERSION_NUMERIC 0x999999
diff --git a/mednafen/headless/headless.h b/mednafen/headless/headless.h
index 5f25e59624..66629b4b9d 100644
--- a/mednafen/headless/headless.h
+++ b/mednafen/headless/headless.h
@@ -9,6 +9,11 @@
 #define WANT_RESAMPLER
 #define WANT_PSF
 #define WANT_DEINTERLACER
+
+//in libmednahawk, we compile all cores together
+//in libretro, we'd want to compile them individually and choose the appropriate WANT_CD
+#define WANT_CDIF
+
 #endif
 
 #ifdef HEADLESS
diff --git a/mednafen/libmednahawk/config.h b/mednafen/libmednahawk/config.h
index 7a332d56da..69c2ad6782 100644
--- a/mednafen/libmednahawk/config.h
+++ b/mednafen/libmednahawk/config.h
@@ -3,7 +3,7 @@
 #define HAVE__MKDIR 1
 #define LSB_FIRST
 #define SIZEOF_DOUBLE 8
-#define WANT_DEBUGGER 1
+#define WANT_DEBUGGER 0
 #define snprintf _snprintf
 #define strcasecmp(x,y) _stricmp(x,y)
 #define strncasecmp(x, y, l) strnicmp(x, y, l)
diff --git a/mednafen/src/mednafen.cpp b/mednafen/src/mednafen.cpp
index ef451675be..388e9b6eb3 100644
--- a/mednafen/src/mednafen.cpp
+++ b/mednafen/src/mednafen.cpp
@@ -188,7 +188,9 @@ static Deinterlacer deint;
 
 static std::vector<int16> SoundBufPristine;
 
+#ifdef WANT_CDIF
 static std::vector<CDIF *> CDInterfaces;	// FIXME: Cleanup on error out.
+#endif
 
 #ifdef WANT_AVDUMP
 bool MDFNI_StartWAVRecord(const char *path, double SoundRate)
@@ -302,9 +304,12 @@ void MDFNI_CloseGame(void)
   MDFN_StateEvilEnd();
 #endif
 
+#ifdef WANT_CDIF
   for(unsigned i = 0; i < CDInterfaces.size(); i++)
    delete CDInterfaces[i];
   CDInterfaces.clear();
+#endif
+
  }
  TBlur_Kill();
 
@@ -711,6 +716,7 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
 	struct stat stat_buf;
 	std::vector<FileExtensionSpecStruct> valid_iae;
 
+#ifdef WANT_CDIF
 	if(strlen(name) > 4 && (!strcasecmp(name + strlen(name) - 4, ".cue") || !strcasecmp(name + strlen(name) - 4, ".toc") || !strcasecmp(name + strlen(name) - 4, ".m3u")))
 	{
 	 return(MDFNI_LoadCD(force_module, name));
@@ -720,6 +726,7 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
 	{
 	 return(MDFNI_LoadCD(force_module, name));
 	}
+#endif
 
 	MDFNI_CloseGame();
 
@@ -778,23 +785,25 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
 
 	 if(force_module)
 	 {
-          if(!strcmp(force_module, (*it)->shortname))
-          {
-	   if(!(*it)->Load)
-	   {
-            GameFile.Close();
+		 if(!strcmp(force_module, (*it)->shortname))
+		 {
+			 if(!(*it)->Load)
+			 {
+				 GameFile.Close();
 
-	    if((*it)->LoadCD)
-             MDFN_PrintError(_("Specified system only supports CD(physical, or image files, such as *.cue and *.toc) loading."));
-	    else
-             MDFN_PrintError(_("Specified system does not support normal file loading."));
-            MDFN_indent(-1);
-            MDFNGameInfo = NULL;
-            return 0;
-	   }
-           MDFNGameInfo = *it;
-           break;
-          }
+				#ifdef WANT_CDIF
+				 if((*it)->LoadCD)
+					 MDFN_PrintError(_("Specified system only supports CD(physical, or image files, such as *.cue and *.toc) loading."));
+				 else
+				#endif
+					 MDFN_PrintError(_("Specified system does not support normal file loading."));
+				 MDFN_indent(-1);
+				 MDFNGameInfo = NULL;
+				 return 0;
+			 }
+			 MDFNGameInfo = *it;
+			 break;
+		 }
 	 }
 	 else
 	 {
@@ -1109,7 +1118,9 @@ bool MDFNI_InitializeModules(const std::vector<MDFNGI *> &ExternalSystems)
 
  MDFNSystemsPrio.sort(MDFNSystemsPrio_CompareFunc);
 
+ #ifdef WANT_CDIF
  CDUtility::CDUtility_Init();
+	#endif
 
  return(1);
 }