From f77c66cc29b1bc0a73be2c9350347c705f3a91b4 Mon Sep 17 00:00:00 2001 From: kenshen112 Date: Sun, 22 May 2022 16:44:51 -0700 Subject: [PATCH] QtHost.cpp: Fixed Resources dir Fixed location of Resources Dir to proper usr/share location --- .gitignore | 1 + pcsx2-qt/QtHost.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9cb112d23..67d4a5ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ oprofile_data/ /bin/**/*.lib /bin/**/*.pdb /bin/pcsx2 +/bin/pcsx2-qt /bin/PCSX2-linux.sh /bin/*ReplayLoader /bin/GS*.txt diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index e7e1805c2..e862e8145 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -161,12 +161,14 @@ void QtHost::SetAppRoot() void QtHost::SetResourcesDirectory() { -#ifndef __APPLE__ +#ifdef __APPLE__ + // On macOS, this is in the bundle resources directory. + EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources")); +#elif !defined(PCSX2_APP_DATADIR) // On Windows/Linux, these are in the binary directory. EmuFolders::Resources = Path::Combine(EmuFolders::AppRoot, "resources"); #else - // On macOS, this is in the bundle resources directory. - EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources")); + EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, PCSX2_APP_DATADIR "/resources")); #endif } -- 2.37.1