macOS: Properly include GameIndex in app bundle

This commit is contained in:
TellowKrinkle 2020-12-16 17:03:01 -06:00 committed by tellowkrinkle
parent 91e8e0d33c
commit 803bac5da0
2 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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