diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index c8ec04024e..ba8a41ae95 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -161,7 +161,7 @@ jobs: - name: Prepare Build Artifacts run: | - mv build/pcsx2*/PCSX2.app PCSX2.app + mv build/pcsx2*/ARMSX2.app ARMSX2.app - name: Pull the Signing Keys and Notarization Credentials if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }} @@ -173,7 +173,7 @@ jobs: if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }} uses: indygreg/apple-code-sign-action@44d0985b7f4363198e80b6fea63ac3e9dd3e9957 with: - input_path: 'PCSX2.app' + input_path: 'ARMSX2.app' p12_file: cert.p12 p12_password: "${{ secrets.APPLE_SIGN_P12_PASS }}" sign_args: | @@ -195,7 +195,7 @@ jobs: # bundle launches on the build machine (matches the README manual build). - name: Ad-hoc Sign the Application if: ${{ !(inputs.sign_and_notarize == true && env.SIGN_KEY) }} - run: codesign --force --deep --sign - PCSX2.app + run: codesign --force --deep --sign - ARMSX2.app - name: Zip Build Artifacts run: | @@ -203,9 +203,9 @@ jobs: if [ -z "$TAG" ]; then APPNAME="${{ steps.artifact-metadata.outputs.artifact-name }}" else - APPNAME="PCSX2-$TAG" + APPNAME="ARMSX2-$TAG" fi - mv PCSX2.app "$APPNAME.app" + mv ARMSX2.app "$APPNAME.app" tar --options xz:compression-level=9 -cvJf "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" "$APPNAME.app" mkdir ci-artifacts cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS-arm64.tar.xz diff --git a/CMakeLists.txt b/CMakeLists.txt index b0c394591c..25055f52a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,12 +82,11 @@ No support will be provided, continue at your own risk. endif() if(ARCH_ARM64) - message(WARNING " -*************** UNSUPPORTED CONFIGURATION *************** -Apple Silicon support in PCSX2 is INCOMPLETE. There are -currently no EE/VU/IOP recompilers, and games will run -VERY slow. There is no date for completion yet, you -should set -DCMAKE_OSX_ARCHITECTURES=x86_64 for now, -unless you want to work on the recompilers. -*********************************************************") + message(STATUS " +*************** ARMSX2 — APPLE SILICON *************** +Initial Apple Silicon (ARM64) support in ARMSX2. +This build adds the EE/VU/IOP recompilers that were +previously missing on Apple Silicon. It is an early +release — expect rough edges. Contributions welcome. +*****************************************************") endif() diff --git a/README.md b/README.md index dc56943ee5..86ced5f029 100644 --- a/README.md +++ b/README.md @@ -90,10 +90,10 @@ cmake --build build --target pcsx2-qt -j$(sysctl -n hw.ncpu) # 4. Post-process macOS bundle (required!) cmake --build build --target pcsx2-postprocess-bundle -codesign --force --deep --sign - build/pcsx2-qt/PCSX2.app +codesign --force --deep --sign - build/pcsx2-qt/ARMSX2.app # 5. Run -open build/pcsx2-qt/PCSX2.app +open build/pcsx2-qt/ARMSX2.app ``` See `arm64-port/CONVENTIONS.md` for the full build/test/debug loop used by the port team. diff --git a/bin/resources/icons/AppIconLarge.png b/bin/resources/icons/AppIconLarge.png index 60ed12d783..e3cb0c6b0a 100644 Binary files a/bin/resources/icons/AppIconLarge.png and b/bin/resources/icons/AppIconLarge.png differ diff --git a/pcsx2-qt/AboutDialog.ui b/pcsx2-qt/AboutDialog.ui index c1f72fef26..a7d8df82e4 100644 --- a/pcsx2-qt/AboutDialog.ui +++ b/pcsx2-qt/AboutDialog.ui @@ -11,7 +11,7 @@ - About PCSX2 + About ARMSX2 @@ -38,7 +38,7 @@ - :/icons/PCSX2logo.svg + :/icons/ARMSX2logo.png false diff --git a/pcsx2-qt/Debugger/DebuggerWindow.ui b/pcsx2-qt/Debugger/DebuggerWindow.ui index 20d2a59ccf..6b86c35d13 100644 --- a/pcsx2-qt/Debugger/DebuggerWindow.ui +++ b/pcsx2-qt/Debugger/DebuggerWindow.ui @@ -11,7 +11,7 @@ - PCSX2 Debugger + ARMSX2 Debugger diff --git a/pcsx2-qt/MainWindow.ui b/pcsx2-qt/MainWindow.ui index 5b03d9f4be..70e89744b5 100644 --- a/pcsx2-qt/MainWindow.ui +++ b/pcsx2-qt/MainWindow.ui @@ -14,7 +14,7 @@ true - PCSX2 + ARMSX2 @@ -574,7 +574,7 @@ :/icons/AppIcon64.png:/icons/AppIcon64.png - &About PCSX2... + &About ARMSX2... diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index fbf7f0a349..4a374f69d8 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -1291,7 +1291,7 @@ bool QtHost::InitializeConfig() if (!EmuFolders::SetResourcesDirectory()) { - QMessageBox::critical(nullptr, QStringLiteral("PCSX2"), + QMessageBox::critical(nullptr, QStringLiteral("ARMSX2"), QStringLiteral("Resources directory is missing, your installation is incomplete.")); return false; } @@ -1300,7 +1300,7 @@ bool QtHost::InitializeConfig() { // no point translating, config isn't loaded QMessageBox::critical( - nullptr, QStringLiteral("PCSX2"), + nullptr, QStringLiteral("ARMSX2"), QStringLiteral("Failed to create data directory at path\n\n%1\n\n" "The error was: %2\n" "Please ensure this directory is writable. You can also try portable mode " @@ -1324,7 +1324,7 @@ bool QtHost::InitializeConfig() { // If the config file doesn't exist, assume this is a new install and don't prompt to overwrite. if (FileSystem::FileExists(s_base_settings_interface->GetFileName().c_str()) && - QMessageBox::question(nullptr, QStringLiteral("PCSX2"), + QMessageBox::question(nullptr, QStringLiteral("ARMSX2"), QStringLiteral("Settings failed to load, or are the incorrect version. Clicking Yes will reset all settings to defaults. " "Do you want to continue?")) != QMessageBox::Yes) { @@ -1340,7 +1340,7 @@ bool QtHost::InitializeConfig() if (!s_base_settings_interface->Save(&error)) { QMessageBox::critical( - nullptr, QStringLiteral("PCSX2"), + nullptr, QStringLiteral("ARMSX2"), QStringLiteral( "Failed to save configuration to\n\n%1\n\nThe error was: %2\n\nPlease ensure this directory is writable. You " "can also try portable mode by creating portable.txt in the same directory you installed PCSX2 into.") @@ -1366,7 +1366,7 @@ bool QtHost::InitializeConfig() if (!s_base_settings_interface->Save(&error)) { QMessageBox::critical( - nullptr, QStringLiteral("PCSX2"), + nullptr, QStringLiteral("ARMSX2"), QStringLiteral( "Failed to save secrets to\n\n%1\n\nThe error was: %2\n\nPlease ensure this directory is writable. You " "can also try portable mode by creating portable.txt in the same directory you installed PCSX2 into.") @@ -1495,7 +1495,7 @@ bool Host::RequestResetSettings(bool folders, bool core, bool controllers, bool QString QtHost::GetAppNameAndVersion() { - return QString("PCSX2 %1").arg(BuildVersion::GitRev); + return QString("ARMSX2 %1").arg(BuildVersion::GitRev); } QString QtHost::GetAppConfigSuffix() diff --git a/pcsx2-qt/QtProgressCallback.cpp b/pcsx2-qt/QtProgressCallback.cpp index 3059120d18..9bef21ac42 100644 --- a/pcsx2-qt/QtProgressCallback.cpp +++ b/pcsx2-qt/QtProgressCallback.cpp @@ -15,7 +15,7 @@ QtModalProgressCallback::QtModalProgressCallback(QWidget* parent_widget, float s , m_dialog(QString(), QString(), 0, 1, parent_widget) , m_show_delay(show_delay) { - m_dialog.setWindowTitle(tr("PCSX2")); + m_dialog.setWindowTitle(tr("ARMSX2")); m_dialog.setMinimumSize(QSize(500, 0)); m_dialog.setModal(parent_widget != nullptr); m_dialog.setAutoClose(false); diff --git a/pcsx2-qt/Settings/ControllerSettingsWindow.ui b/pcsx2-qt/Settings/ControllerSettingsWindow.ui index dde6ff488a..b5ba9e4a66 100644 --- a/pcsx2-qt/Settings/ControllerSettingsWindow.ui +++ b/pcsx2-qt/Settings/ControllerSettingsWindow.ui @@ -17,7 +17,7 @@ - PCSX2 Controller Settings + ARMSX2 Controller Settings diff --git a/pcsx2-qt/Settings/OSDSettingsWidget.ui b/pcsx2-qt/Settings/OSDSettingsWidget.ui index 1fc86aacde..9f382cbf83 100644 --- a/pcsx2-qt/Settings/OSDSettingsWidget.ui +++ b/pcsx2-qt/Settings/OSDSettingsWidget.ui @@ -369,7 +369,7 @@ - Show PCSX2 Version + Show ARMSX2 Version diff --git a/pcsx2-qt/Settings/SettingsWindow.ui b/pcsx2-qt/Settings/SettingsWindow.ui index 3f8b4d4f75..cfc51d0a99 100644 --- a/pcsx2-qt/Settings/SettingsWindow.ui +++ b/pcsx2-qt/Settings/SettingsWindow.ui @@ -17,7 +17,7 @@ - PCSX2 Settings + ARMSX2 Settings diff --git a/pcsx2-qt/SetupWizardDialog.ui b/pcsx2-qt/SetupWizardDialog.ui index 4d13ebacef..9c4be69bf9 100644 --- a/pcsx2-qt/SetupWizardDialog.ui +++ b/pcsx2-qt/SetupWizardDialog.ui @@ -11,7 +11,7 @@ - PCSX2 Setup Wizard + ARMSX2 Setup Wizard @@ -147,7 +147,7 @@ - <html><head/><body><h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:700;">Welcome to PCSX2!</span></h1><p>This wizard will help guide you through the configuration steps required to use the application. It is recommended if this is your first time installing PCSX2 that you view the setup guide <a href="https://pcsx2.net/docs/">here</a>.</p><p>By default, PCSX2 will connect to the server at <a href="https://pcsx2.net/">pcsx2.net</a> to check for updates, and if available and confirmed, download update packages from <a href="https://github.com/">github.com</a>. If you do not wish for PCSX2 to make any network connections on startup, you should uncheck the Automatic Updates option now. The Automatic Update setting can be changed later at any time in Interface Settings.</p><p>Please choose a language and theme to begin.</p></body></html> + <html><head/><body><h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:700;">Welcome to ARMSX2!</span></h1><p>This wizard will help guide you through the configuration steps required to use the application. It is recommended if this is your first time installing ARMSX2 that you view the setup guide <a href="https://pcsx2.net/docs/">here</a>.</p><p>By default, ARMSX2 will connect to the server at <a href="https://pcsx2.net/">pcsx2.net</a> to check for updates, and if available and confirmed, download update packages from <a href="https://github.com/">github.com</a>. If you do not wish for ARMSX2 to make any network connections on startup, you should uncheck the Automatic Updates option now. The Automatic Update setting can be changed later at any time in Interface Settings.</p><p>Please choose a language and theme to begin.</p></body></html> Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -239,7 +239,7 @@ - <html><head/><body><p>PCSX2 requires a PS2 BIOS in order to run.</p><p>For legal reasons, you must obtain a BIOS <strong>from an actual PS2 unit that you own</strong> (borrowing doesn't count).</p><p>Once dumped, this BIOS image should be placed in the bios folder within the data directory shown below, or you can instruct PCSX2 to scan an alternative directory.</p><p>A guide for dumping your BIOS can be found <a href="https://pcsx2.net/docs/setup/bios/">here</a>.</p></body></html> + <html><head/><body><p>ARMSX2 requires a PS2 BIOS in order to run.</p><p>For legal reasons, you must obtain a BIOS <strong>from an actual PS2 unit that you own</strong> (borrowing doesn't count).</p><p>Once dumped, this BIOS image should be placed in the bios folder within the data directory shown below, or you can instruct ARMSX2 to scan an alternative directory.</p><p>A guide for dumping your BIOS can be found <a href="https://pcsx2.net/docs/setup/bios/">here</a>.</p></body></html> Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -359,7 +359,7 @@ - <html><head/><body><p>PCSX2 will automatically scan and identify games from the selected directories below, and populate the game list.<br>These games should be dumped from discs you own. Guides for dumping discs can be found <a href="https://pcsx2.net/docs/setup/dumping">here</a>.</p><p>Supported formats for dumps include:</p><p><ul><li>.bin/.iso (ISO Disc Images)</li><li>.mdf (Media Descriptor File)</li><li>.chd (Compressed Hunks of Data)</li><li>.cso (Compressed ISO)</li><li>.zso (Compressed ISO)</li><li>.gz (Gzip Compressed ISO)</li></ul></p></p></body></html> + <html><head/><body><p>ARMSX2 will automatically scan and identify games from the selected directories below, and populate the game list.<br>These games should be dumped from discs you own. Guides for dumping discs can be found <a href="https://pcsx2.net/docs/setup/dumping">here</a>.</p><p>Supported formats for dumps include:</p><p><ul><li>.bin/.iso (ISO Disc Images)</li><li>.mdf (Media Descriptor File)</li><li>.chd (Compressed Hunks of Data)</li><li>.cso (Compressed ISO)</li><li>.zso (Compressed ISO)</li><li>.gz (Gzip Compressed ISO)</li></ul></p></p></body></html> Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -476,7 +476,7 @@ - <html><head/><body><p>By default, PCSX2 will map your keyboard to the virtual PS2 controller.</p><p><span style=" font-weight:704;">To use an external controller, you must map it first. </span>On this screen, you can automatically map any controller which is currently connected. If your controller is not currently connected, you can plug it in now.</p><p>To change controller bindings in more detail, or use multi-tap, open the Settings menu and choose Controllers once you have completed the Setup Wizard.</p><p>Guides for configuring controllers can be found <a href="https://pcsx2.net/docs/post/controllers/"><span style="">here</span></a>.</p></body></html> + <html><head/><body><p>By default, ARMSX2 will map your keyboard to the virtual PS2 controller.</p><p><span style=" font-weight:704;">To use an external controller, you must map it first. </span>On this screen, you can automatically map any controller which is currently connected. If your controller is not currently connected, you can plug it in now.</p><p>To change controller bindings in more detail, or use multi-tap, open the Settings menu and choose Controllers once you have completed the Setup Wizard.</p><p>Guides for configuring controllers can be found <a href="https://pcsx2.net/docs/post/controllers/"><span style="">here</span></a>.</p></body></html> true @@ -719,7 +719,7 @@ - <html><head/><body><p align="justify">PCSX2 supports RetroAchievements, a service that adds achievements, leaderboards, and extra challenges to classic games.</p><p align="justify">Sign in below to link your account and start earning achievements in supported titles, or create a free account at <a href="https://retroachievements.org/createaccount.php"><span style=" text-decoration: underline; color:#27bf73;">retroachievements.org/createaccount.php</span></a>.</p><p align="justify">Using RetroAchievements is completely optional and not required to use PCSX2.</p></body></html> + <html><head/><body><p align="justify">ARMSX2 supports RetroAchievements, a service that adds achievements, leaderboards, and extra challenges to classic games.</p><p align="justify">Sign in below to link your account and start earning achievements in supported titles, or create a free account at <a href="https://retroachievements.org/createaccount.php"><span style=" text-decoration: underline; color:#27bf73;">retroachievements.org/createaccount.php</span></a>.</p><p align="justify">Using RetroAchievements is completely optional and not required to use ARMSX2.</p></body></html> Qt::TextFormat::RichText @@ -902,7 +902,7 @@ - <html><head/><body><h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:700;">Setup Complete!</span></h1><p>You are now ready to run games.</p><p><span style=" font-weight:700;">Warning: Do not run untrusted programs in PCSX2. It is not a sandbox and cannot protect your computer from malicious software.</span></p><p>Further options are available under the settings menu. You can also use the Big Picture UI for navigation entirely with a gamepad.</p><p>We hope you enjoy using PCSX2.</p></body></html> + <html><head/><body><h1 style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:700;">Setup Complete!</span></h1><p>You are now ready to run games.</p><p><span style=" font-weight:700;">Warning: Do not run untrusted programs in ARMSX2. It is not a sandbox and cannot protect your computer from malicious software.</span></p><p>Further options are available under the settings menu. You can also use the Big Picture UI for navigation entirely with a gamepad.</p><p>We hope you enjoy using ARMSX2.</p></body></html> Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop diff --git a/pcsx2-qt/ShortcutCreationDialog.cpp b/pcsx2-qt/ShortcutCreationDialog.cpp index cd5fc1f032..165f5280c8 100644 --- a/pcsx2-qt/ShortcutCreationDialog.cpp +++ b/pcsx2-qt/ShortcutCreationDialog.cpp @@ -423,7 +423,7 @@ void ShortcutCreationDialog::CreateShortcut(const std::string name, const std::s } else { - icon_name = "PCSX2"; + icon_name = "ARMSX2"; std::string icon_path_dest = fmt::format("{}/{}.png", icon_dest, icon_name).c_str(); if (FileSystem::EnsureDirectoryExists(icon_dest.c_str(), true)) if (!FileSystem::FileExists(icon_path_dest.c_str())) diff --git a/pcsx2-qt/resources/icons/ARMSX2logo.png b/pcsx2-qt/resources/icons/ARMSX2logo.png new file mode 100644 index 0000000000..ad01ea1cae Binary files /dev/null and b/pcsx2-qt/resources/icons/ARMSX2logo.png differ diff --git a/pcsx2-qt/resources/icons/AppIcon64.png b/pcsx2-qt/resources/icons/AppIcon64.png index 1bf904052e..570eeda886 100644 Binary files a/pcsx2-qt/resources/icons/AppIcon64.png and b/pcsx2-qt/resources/icons/AppIcon64.png differ diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index ec1f0ca907..7479a8f6bc 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -104,6 +104,7 @@ icons/black/svg/zoom-in-line.svg icons/black/svg/zoom-out-line.svg icons/PCSX2logo.svg + icons/ARMSX2logo.png icons/QT.png icons/update.png icons/white/index.theme diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 404d152efe..37f721cba8 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1421,12 +1421,12 @@ function(setup_main_executable target) MACOSX_BUNDLE true MACOSX_BUNDLE_INFO_PLIST "${PCSX2_SOURCE_DIR}/Resources/Info.plist.in" XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${PCSX2_SOURCE_DIR}/Resources/PCSX2.entitlements" - OUTPUT_NAME PCSX2 + OUTPUT_NAME ARMSX2 # Fixes complaints when Xcode tries to sign for running locally about MoltenVK not being signed XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS --deep ) - pcsx2_resource(${target} ${PCSX2_SOURCE_DIR}/Resources/PCSX2.icns ${PCSX2_SOURCE_DIR}/Resources) + pcsx2_resource(${target} ${PCSX2_SOURCE_DIR}/Resources/ARMSX2.icns ${PCSX2_SOURCE_DIR}/Resources) # Copy shaderc into the bundle target_sources(${target} PRIVATE "${SHADERC_LIBRARY}") diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 9ce7f23c1d..fd643c16b9 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -1278,7 +1278,7 @@ void FullscreenUI::DrawLandingTemplate(ImVec2* menu_pos, ImVec2* menu_size) dl->AddImage(reinterpret_cast(GetCachedTexture("icons/AppIconLarge.png")->GetNativeHandle()), logo_pos, logo_pos + logo_size); const ImVec2 branding_pos(logo_pos.x + logo_size.x + LayoutScale(LAYOUT_MENU_BUTTON_X_PADDING), logo_pos.y); - ImGuiFullscreen::AddTextWithShadow(dl, heading_font, branding_pos, ImGui::GetColorU32(ImGuiCol_Text), "PCSX2"); + ImGuiFullscreen::AddTextWithShadow(dl, heading_font, branding_pos, ImGui::GetColorU32(ImGuiCol_Text), "ARMSX2"); } // draw time diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index e02d7d7a1c..f6146b8e93 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -2215,7 +2215,7 @@ bool EmuFolders::SetDataDirectory(Error* error) if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &documents_directory))) { if (std::wcslen(documents_directory) > 0) - DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "PCSX2"); + DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "ARMSX2"); CoTaskMemFree(documents_directory); } #elif defined(__linux__) || defined(__FreeBSD__) @@ -2223,7 +2223,7 @@ bool EmuFolders::SetDataDirectory(Error* error) const char* xdg_config_home = getenv("XDG_CONFIG_HOME"); if (xdg_config_home && Path::IsAbsolute(xdg_config_home)) { - DataRoot = Path::RealPath(Path::Combine(xdg_config_home, "PCSX2")); + DataRoot = Path::RealPath(Path::Combine(xdg_config_home, "ARMSX2")); } else { @@ -2236,18 +2236,18 @@ bool EmuFolders::SetDataDirectory(Error* error) if (!FileSystem::DirectoryExists(config_dir.c_str())) FileSystem::CreateDirectoryPath(config_dir.c_str(), false); - DataRoot = Path::RealPath(Path::Combine(config_dir, "PCSX2")); + DataRoot = Path::RealPath(Path::Combine(config_dir, "ARMSX2")); } } #elif defined(__APPLE__) - static constexpr char MAC_DATA_DIR[] = "Library/Application Support/PCSX2"; + static constexpr char MAC_DATA_DIR[] = "Library/Application Support/ARMSX2"; const char* home_dir = getenv("HOME"); if (home_dir) DataRoot = Path::RealPath(Path::Combine(home_dir, MAC_DATA_DIR)); #endif } else // Otherwise use the custom path provided by the user - DataRoot = Path::RealPath(Path::Combine(EmuConfig.CustomDataPath, "PCSX2")); + DataRoot = Path::RealPath(Path::Combine(EmuConfig.CustomDataPath, "ARMSX2")); } // Couldn't determine the data directory, or using portable mode? fallback to portable. @@ -2260,7 +2260,7 @@ bool EmuFolders::SetDataDirectory(Error* error) if (getenv("APPIMAGE")) { std::string_view appimage_path = Path::GetDirectory(getenv("APPIMAGE")); - DataRoot = Path::RealPath(Path::Combine(appimage_path, "PCSX2")); + DataRoot = Path::RealPath(Path::Combine(appimage_path, "ARMSX2")); } else DataRoot = Path::Combine(AppRoot, GetPortableModePath()); diff --git a/pcsx2/Resources/ARMSX2.icns b/pcsx2/Resources/ARMSX2.icns new file mode 100644 index 0000000000..e682e3af24 Binary files /dev/null and b/pcsx2/Resources/ARMSX2.icns differ diff --git a/pcsx2/Resources/Info.plist.in b/pcsx2/Resources/Info.plist.in index e629294aa3..236534fc0d 100644 --- a/pcsx2/Resources/Info.plist.in +++ b/pcsx2/Resources/Info.plist.in @@ -14,7 +14,7 @@ mdf CFBundleTypeIconFile - PCSX2.icns + ARMSX2.icns CFBundleTypeName PS2 Game CFBundleTypeRole @@ -26,7 +26,7 @@ elf CFBundleTypeIconFile - PCSX2.icns + ARMSX2.icns CFBundleTypeName PS2 Homebrew Application CFBundleTypeRole @@ -40,9 +40,9 @@ gs.zst CFBundleTypeIconFile - PCSX2.icns + ARMSX2.icns CFBundleTypeName - PCSX2 GSdump + ARMSX2 GSdump CFBundleTypeRole Viewer @@ -52,19 +52,23 @@ p2s CFBundleTypeIconFile - PCSX2.icns + ARMSX2.icns CFBundleTypeName - PCSX2 Save State + ARMSX2 Save State CFBundleTypeRole Viewer + CFBundleName + ARMSX2 + CFBundleDisplayName + ARMSX2 CFBundleExecutable - PCSX2 + ARMSX2 CFBundleIconFile - PCSX2.icns + ARMSX2.icns CFBundleIdentifier - net.pcsx2.pcsx2 + net.armsx2.armsx2 CFBundleDevelopmentRegion English CFBundlePackageType @@ -83,7 +87,7 @@ ${PCSX2_CAMERA_USAGE_DESCRIPTION} NSMicrophoneUsageDescription ${PCSX2_MICROPHONE_USAGE_DESCRIPTION} - LSApplicationCategoryType + LSApplicationCategoryType public.app-category.games CFBundleDevelopmentRegion en @@ -179,13 +183,13 @@ UTTypeIdentifier - net.pcsx2.pnach + net.armsx2.pnach UTTypeConformsTo public.ini UTTypeDescription - PCSX2 Game Patch + ARMSX2 Game Patch UTTypeTagSpecification public.filename-extension @@ -196,13 +200,13 @@ UTTypeIdentifier - net.pcsx2.memcard + net.armsx2.memcard UTTypeConformsTo public.data UTTypeDescription - PCSX2 Memory Card + ARMSX2 Memory Card UTTypeTagSpecification public.filename-extension @@ -213,13 +217,13 @@ UTTypeIdentifier - net.pcsx2.savestate + net.armsx2.savestate UTTypeConformsTo public.data UTTypeDescription - PCSX2 Save State + ARMSX2 Save State UTTypeTagSpecification public.filename-extension @@ -230,13 +234,13 @@ UTTypeIdentifier - net.pcsx2.gsdump + net.armsx2.gsdump UTTypeConformsTo public.data UTTypeDescription - PCSX2 GSdump + ARMSX2 GSdump UTTypeTagSpecification public.filename-extension diff --git a/pcsx2/Resources/PCSX2.icns b/pcsx2/Resources/PCSX2.icns deleted file mode 100644 index 411bdc4d40..0000000000 Binary files a/pcsx2/Resources/PCSX2.icns and /dev/null differ