diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-05 18:52:56 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-05 18:52:56 +0000 |
| commit | 7d0f03cb61686f3e82eb0850bf8633484928d6dd (patch) | |
| tree | c432cf29d348027b9f3486d90c36a5316d7226dd /Source/Core/Common/Src/FileUtil.cpp | |
| parent | 53f9858b94973fdaa1699278b3805fe489aaabdc (diff) | |
Don't store the absolute pathname of plugins in the configuration file,
just the basename like libPlugin_foo.dylib. Dolphin then loads the
plugins relative to the compiled-in plugins directory.
This means that you won't have to reselect the plugins when running
different builds (in different directories) and is most obviously
beneficial on OS X where application bundles are not (should not) be
expected to stay in the place where they are first installed.
This is tested on OS X and Linux with local/global build options, but
not Windows. I don't anticipate any problems on Windows, but that OS
does have slightly different semantics with regard to path component
separators and file suffixes, so it's something to watch out for.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5621 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/FileUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/FileUtil.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 728628e9e7..8e6006bb58 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -581,13 +581,9 @@ std::string GetPluginsDirectory() pluginsDir = GetBundleDirectory(); pluginsDir += DIR_SEP; pluginsDir += PLUGINS_DIR; -#elif defined __linux__ - pluginsDir = PLUGINS_DIR; - // FIXME global install #else - pluginsDir = PLUGINS_DIR; + pluginsDir = PLUGINS_DIR; #endif - pluginsDir += DIR_SEP; INFO_LOG(COMMON, "GetPluginsDirectory: Setting to %s:", pluginsDir.c_str()); @@ -602,14 +598,11 @@ std::string GetSysDirectory() sysDir = GetBundleDirectory(); sysDir += DIR_SEP; sysDir += SYSDATA_DIR; -#elif defined __linux__ - sysDir = SYSDATA_DIR; - // FIXME global install #else - sysDir = SYSDATA_DIR; + sysDir = SYSDATA_DIR; #endif - sysDir += DIR_SEP; + INFO_LOG(COMMON, "GetSysDirectory: Setting to %s:", sysDir.c_str()); return sysDir; } |