diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2016-10-02 22:46:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 22:46:14 -0700 |
| commit | 09fd2fd8e2a931947abb870f901e65a2cd211708 (patch) | |
| tree | 95d999498ad122b951417b0e800eb67434a572b8 /Source/Core/DolphinWX/Main.cpp | |
| parent | fba6801851d68c32b77bfd66f0e2b263b3d81c98 (diff) | |
| parent | 9842cef13f6a5ff8b524f6676f65fb3495846e7f (diff) | |
Merge pull request #4015 from EmptyChaos/wx-misc-fixes
WX: Fix pop-under (win) / game list garbage (win) / language support (Linux)
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index fdaa94b6d5..305cae3b7d 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -315,11 +315,11 @@ void DolphinApp::InitLanguageSupport() m_locale.reset(new wxLocale(language)); // Specify where dolphins *.gmo files are located on each operating system -#ifdef _WIN32 +#ifdef __WXMSW__ m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); -#elif defined(__LINUX__) +#elif defined(__WXGTK__) m_locale->AddCatalogLookupPathPrefix(StrToWxStr(DATA_DIR "../locale")); -#elif defined(__APPLE__) +#elif defined(__WXOSX__) m_locale->AddCatalogLookupPathPrefix( StrToWxStr(File::GetBundleDirectory() + "Contents/Resources")); #endif |