aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-07-08 21:36:59 +0000
committerMax Horn2002-07-08 21:36:59 +0000
commit5fa2ab9e006e041e78b966ec5baa42872e69114f (patch)
tree0cc411042a9de6d7b1a24086d34eccefcfd07432
parent42be969348ac08eccc9555f5a12a7e3f0d7998df (diff)
downloadscummvm-rg350-5fa2ab9e006e041e78b966ec5baa42872e69114f.tar.gz
scummvm-rg350-5fa2ab9e006e041e78b966ec5baa42872e69114f.tar.bz2
scummvm-rg350-5fa2ab9e006e041e78b966ec5baa42872e69114f.zip
hook in the Mac Carbon port SelectGame method. Still not at all useful; I believe it's better to wait for a portable ScummVM GUI and then use that instead...
svn-id: r4499
-rw-r--r--gameDetector.cpp6
-rwxr-xr-xmac/macos.h3
-rw-r--r--mac/scummvm.mcpbin158716 -> 158716 bytes
3 files changed, 7 insertions, 2 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp
index b260d1afd4..d05680e71f 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -505,9 +505,13 @@ int GameDetector::detectMain(int argc, char **argv)
_midi_driver = MD_AUTO;
-#ifdef __DC__
+#if defined(__DC__)
extern int dc_setup(GameDetector &detector);
dc_setup(*this);
+#elif defined(MACOS_CARBON)
+ extern char* SelectGame();
+ char *game_name = SelectGame();
+ printf(game_name);
#else
_saveconfig = false;
updateconfig();
diff --git a/mac/macos.h b/mac/macos.h
index 0f1464969d..09c40456e9 100755
--- a/mac/macos.h
+++ b/mac/macos.h
@@ -20,4 +20,5 @@
*/
//#define MACOS_SDL
- #define MACOS_CARBON \ No newline at end of file
+ #define MACOS_CARBON
+ \ No newline at end of file
diff --git a/mac/scummvm.mcp b/mac/scummvm.mcp
index f233f7c539..a0c11c7642 100644
--- a/mac/scummvm.mcp
+++ b/mac/scummvm.mcp
Binary files differ