diff --git a/CMakeLists.txt b/CMakeLists.txt index 088f37d2cb..0f7bd266c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1257,7 +1257,11 @@ elseif(WIN32) endif() elseif(LIBRETRO) else() - set(TargetBin PPSSPPSDL) + if(GOLD) + set(TargetBin PPSSPPGold) + else() + set(TargetBin PPSSPPSDL) + endif() # Require SDL add_definitions(-DSDL) set(nativeExtra ${nativeExtra} @@ -2550,11 +2554,11 @@ if(TargetBin) file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/") else() add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource}) - file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPPSDL.app/Contents/Frameworks/") + file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/${TargetBin}.app/Contents/Frameworks/") if(USING_QT_UI) add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/Qt/macbundle.sh" "${CMAKE_BINARY_DIR}/PPSSPPQt.app") else() - add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/SDL/macbundle.sh" "${CMAKE_BINARY_DIR}/PPSSPPSDL.app") + add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/SDL/macbundle.sh" "${CMAKE_BINARY_DIR}/${TargetBin}.app" "${TargetBin}") endif() endif() elseif(WIN32) @@ -2620,9 +2624,15 @@ if(IOS AND NOT LIBRETRO) endif() if(MACOSX) -set_target_properties(${TargetBin} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist" - ) + if(GOLD) + set_target_properties(${TargetBin} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/InfoGold.plist" + ) + else() + set_target_properties(${TargetBin} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist" + ) + endif() endif() if(UNIX AND NOT ANDROID AND NOT APPLE) diff --git a/SDL/macbundle.sh b/SDL/macbundle.sh index 1a62948414..9c67205efc 100755 --- a/SDL/macbundle.sh +++ b/SDL/macbundle.sh @@ -3,7 +3,8 @@ echo "Hello" PPSSPP="${1}" -PPSSPPSDL="${PPSSPP}/Contents/MacOS/PPSSPPSDL" +PPSSPP_SHORTNAME="${2}" +PPSSPPSDL="${PPSSPP}/Contents/MacOS/${PPSSPP_SHORTNAME}" ls ${PPSSPPSDL} diff --git a/macOS/InfoGold.plist b/macOS/InfoGold.plist new file mode 100644 index 0000000000..0d8a4b0173 --- /dev/null +++ b/macOS/InfoGold.plist @@ -0,0 +1,135 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeName + PSP ISO Image + CFBundleTypeRole + Viewer + LSHandlerRank + Default + LSItemContentTypes + + public.iso-image + + NSDocumentClass + + + + CFBundleTypeExtensions + + cso + + CFBundleTypeName + PSP CSO Image + CFBundleTypeRole + Viewer + LSHandlerRank + Default + LSItemContentTypes + + org.ppsspp.csoimg + + + + CFBundleTypeExtensions + + pbp + + CFBundleTypeName + PSP PBP Image + CFBundleTypeRole + Viewer + LSHandlerRank + Default + LSItemContentTypes + + org.ppsspp.pbp + + + + CFBundleExecutable + Contents/MacOS/PPSSPPGold + CFBundleGetInfoString + + CFBundleIconFile + ppsspp_gold.icns + CFBundleIdentifier + org.ppsspp.ppssppgold + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLongVersionString + + CFBundleName + PPSSPPGold + CFBundlePackageType + APPL + CFBundleShortVersionString + + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + org.ppsspp.openpspgame + CFBundleURLSchemes + + ppsspp + + + + CFBundleVersion + + CSResourcesFileMapped + + NSHumanReadableCopyright + + UTExportedTypeDeclarations + + + UTTypeDescription + PSP CSO Image + UTTypeIcons + + UTTypeIconText + PSP CSO Image + + UTTypeIdentifier + org.ppsspp.csoimg + UTTypeTagSpecification + + public.filename-extension + + cso + + + + + UTTypeDescription + PBP File + UTTypeIcons + + UTTypeIconText + PSP PBP Image + + UTTypeIdentifier + org.ppsspp.pbp + UTTypeTagSpecification + + public.filename-extension + + pbp + + + + + +