diff options
| author | 2019-08-11 12:28:07 +0200 | |
|---|---|---|
| committer | 2019-08-22 14:41:11 +0200 | |
| commit | 246b515a869ebe4a8d6c12773db85724e8156f5d (patch) | |
| tree | e2ca0eb654225e3ca38e73b73a8f260ce32d67c8 /src | |
| parent | Merge pull request #2748 from FernandoS27/align-memory (diff) | |
| download | yuzu-246b515a869ebe4a8d6c12773db85724e8156f5d.tar.gz yuzu-246b515a869ebe4a8d6c12773db85724e8156f5d.tar.xz yuzu-246b515a869ebe4a8d6c12773db85724e8156f5d.zip | |
citra_qt: on osx chdir to bundle dir to allow detection of user folder
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index a7c656fdb..693bb1fcf 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <clocale> | 6 | #include <clocale> |
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <thread> | 8 | #include <thread> |
| 9 | #include <unistd.h> | ||
| 9 | 10 | ||
| 10 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. | 11 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. |
| 11 | #include "applets/error.h" | 12 | #include "applets/error.h" |
| @@ -2168,6 +2169,11 @@ int main(int argc, char* argv[]) { | |||
| 2168 | QCoreApplication::setOrganizationName(QStringLiteral("yuzu team")); | 2169 | QCoreApplication::setOrganizationName(QStringLiteral("yuzu team")); |
| 2169 | QCoreApplication::setApplicationName(QStringLiteral("yuzu")); | 2170 | QCoreApplication::setApplicationName(QStringLiteral("yuzu")); |
| 2170 | 2171 | ||
| 2172 | #ifdef __APPLE__ | ||
| 2173 | std::string bin_path = FileUtil::GetBundleDirectory() + DIR_SEP + ".."; | ||
| 2174 | chdir(bin_path.c_str()); | ||
| 2175 | #endif | ||
| 2176 | |||
| 2171 | // Enables the core to make the qt created contexts current on std::threads | 2177 | // Enables the core to make the qt created contexts current on std::threads |
| 2172 | QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); | 2178 | QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); |
| 2173 | QApplication app(argc, argv); | 2179 | QApplication app(argc, argv); |