aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-11-25 23:28:10 +0000
committerMax Horn2002-11-25 23:28:10 +0000
commitdf56e29d2e92ddb779edaf39d1026e3db77ee231 (patch)
treea07bdd63b5612cf060bed3dcedf3957612786bf7
parent850428d1a500c5c01e4aa5b31cd8092fa66a991f (diff)
downloadscummvm-rg350-df56e29d2e92ddb779edaf39d1026e3db77ee231.tar.gz
scummvm-rg350-df56e29d2e92ddb779edaf39d1026e3db77ee231.tar.bz2
scummvm-rg350-df56e29d2e92ddb779edaf39d1026e3db77ee231.zip
Moved config file to a more Macish location on OS X
svn-id: r5716
-rw-r--r--README9
-rw-r--r--common/main.cpp8
2 files changed, 11 insertions, 6 deletions
diff --git a/README b/README
index 726cd06ba7..a7cd06f6c2 100644
--- a/README
+++ b/README
@@ -502,11 +502,12 @@ Configuration file:
-------------------
By default, the configuration file is saved in, and loaded from:
- Windows: <windir>\scummvm.ini,
- Linux: ~/.scummvmrc
- Others: scummvm.ini in the current directory
+ Windows: <windir>\scummvm.ini,
+ Linux: ~/.scummvmrc
+ Mac OS X: ~/Library/Preferences/ScummVM Preferences
+ Others: scummvm.ini in the current directory
-An example config file is as follows:
+An example config file looks as follows:
[scummvm]
gfx_mode=supereagle
diff --git a/common/main.cpp b/common/main.cpp
index 26c6d6880b..b411bca065 100644
--- a/common/main.cpp
+++ b/common/main.cpp
@@ -48,7 +48,11 @@ extern "C" int main(int argc, char *argv[]);
#ifndef MAXPATHLEN
#define MAXPATHLEN 256
#endif
+#ifdef MACOSX
+#define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"
+#else
#define DEFAULT_CONFIG_FILE ".scummvmrc"
+#endif
#else
#define DEFAULT_CONFIG_FILE "scummvm.ini"
#endif
@@ -153,9 +157,9 @@ int main(int argc, char *argv[])
sprintf(scummhome,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);
else strcpy(scummhome,DEFAULT_CONFIG_FILE);
#else
- char scummhome[255];
+ char scummhome[256];
#if defined (WIN32) && !defined(_WIN32_WCE)
- GetWindowsDirectory(scummhome, 255);
+ GetWindowsDirectory(scummhome, 256);
strcat(scummhome, "\\");
strcat(scummhome, DEFAULT_CONFIG_FILE);
#else