diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index a1132f4366..5feaa9c2a8 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1131,7 +1131,9 @@ if (APPLE) ) target_sources(${Output} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/gui/Resources/PCSX2.icns") + target_sources(${Output} PRIVATE "${CMAKE_SOURCE_DIR}/bin/GameIndex.yaml") set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gui/Resources/PCSX2.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_source_files_properties("${CMAKE_SOURCE_DIR}/bin/GameIndex.yaml" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # If they say to skip postprocess bundle, leave the target in but make it so they have # to manually run it diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index d677683ee9..a743c9de9d 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -173,7 +173,9 @@ namespace PathDefs wxDirName GetProgramDataDir() { -#ifndef GAMEINDEX_DIR_COMPILATION +#ifdef __APPLE__ + return wxDirName(wxStandardPaths::Get().GetResourcesDir()); +#elif !defined(GAMEINDEX_DIR_COMPILATION) return AppRoot(); #else // Each linux distributions have his rules for path so we give them the possibility to