diff --git a/gnu/local.mk b/gnu/local.mk index f7d6d5db95..e058536d31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2077,7 +2077,6 @@ dist_patch_DATA = \ %D%/packages/patches/podofo-gcc-14.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/pounce-readable-checks.patch \ - %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ %D%/packages/patches/prusa-slicer-add-cmake-module.patch \ %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c1f02c452a..252ef11762 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4708,158 +4708,6 @@ emulator framework based on QEMU.") (sha256 (base32 "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz")))))) -(define-public ppsspp - (package - (name "ppsspp") - (version "1.14.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hrydgard/ppsspp") - (commit (string-append "v" version)))) - (sha256 - (base32 "1l80zs1khph4a3g3hnh91awafmyy6wdcayb81xnflkzmpv3bwq8i")) - (file-name (git-file-name name version)) - (patches - (search-patches "ppsspp-disable-upgrade-and-gold.patch")) - (modules '((guix build utils))) - (snippet - `(begin - ;; The following is quite a heavy-handed way of unbundling PPSSPP. - ;; There are still a number of external sources, that we don't - ;; remove here. Some may be packaged, others are not. - ;; First, we patch existing sources to include the right headers. - (substitute* (append (find-files "Common" ".*\\.(h|cpp)") - (find-files "Core" ".*\\.(h|cpp)") - (find-files "GPU" ".*\\.(h|cpp)") - (find-files "SDL" ".*\\.(h|cpp)") - (find-files "UI" ".*\\.(h|cpp)")) - ;; These headers are all hard-coded in the original source. - (("ext/cityhash/") "") - (("ext/glslang/glslang/") "glslang/") - (("ext/glslang/") "glslang/") - (("ext/miniupnp/") "") - (("ext/SPIRV-Cross/") "spirv_cross/") - (("ext/vulkan/") "vulkan/") - (("ext/xxhash.h") "xxhash.h") - ;; These definitions do not actually exist in the Vulkan headers, - ;; but PPSSPP defines them in ext/vulkan. - (("VK_FORMAT_BEGIN_RANGE") "VK_FORMAT_UNDEFINED") - (("VK_FORMAT_END_RANGE") "VK_FORMAT_ASTC_12x12_SRGB_BLOCK")) - ;; Next, we patch CMakeLists. - (substitute* "CMakeLists.txt" - ;; Drop unnecessary includes and targets. - (("include_directories\\(ext/glslang\\)") "") - (("target_include_directories\\(.*ext/xxhash\\)") "") - (("target_include_directories\\(.*ext/cityhash\\)") "") - (("set_target_properties\\(cityhash .*\\)") "") - ;; Fix linking to GLEW. - (("TARGET Ext::GLEW") "true") - (("target_link_libraries\\(native Ext::GLEW\\)") - "find_package(GLEW)\ntarget_link_libraries(native GLEW::GLEW)") - (("Ext::Snappy") "snappy") - ;; Don't search for cityhash/xxhash, we already have them. - (("add_library\\((city|xx)hash STATIC") "if()\nendif(") - (("ext/xxhash\\.[ch]") "") - (("ext/cityhash/.*\\.(cpp|h)") "") - (("if\\(USE_MINIUPNPC\\)" all) - (string-append all " -find_package(miniupnpc) -target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS}) -elseif(FALSE)")) - ;; Link all of spirv-cross. - (("spirv-cross-glsl" all) - (string-append all - " spirv-cross-core spirv-cross-cpp" - " spirv-cross-reflect spirv-cross-util"))) - (substitute* "ext/CMakeLists.txt" - (("add_subdirectory\\(glew.*") "") - (("add_subdirectory\\(glslang.*") "") - (("add_subdirectory\\(snappy.*") "") - (("add_subdirectory\\(SPIRV-Cross-build.*") "") - (("add_subdirectory\\(zstd.*") "")) - ;; Finally, we can delete the bundled sources. - (for-each delete-file-recursively - '("ext/cmake" - "ext/glew" - "ext/glslang" "ext/glslang-build" - "ext/miniupnp" "ext/miniupnp-build" - "ext/native" - "ext/snappy" - "ext/SPIRV-Cross" "ext/SPIRV-Cross-build" - "ext/vulkan" - "ext/xxhash.c" - "ext/xxhash.h" - "ext/zlib" - "ext/zstd")) - ;; Since we are not including git as an input, PPSSPP is confused - ;; about its version. Let's fix that here. - (substitute* "git-version.cmake" - (("unknown") ,version)))))) - (build-system cmake-build-system) - (native-inputs (list pkg-config python)) - (inputs (list bash - cityhash - ffmpeg-4 - glew - glslang - libpng - libzip - mesa - miniupnpc - sdl2 - snappy - spirv-cross - vulkan-headers - vulkan-loader - xxhash - zlib - `(,zstd "lib"))) - (arguments - (list - #:out-of-source? #f - #:configure-flags #~(list "-DARMIPS_USE_STD_FILESYSTEM=ON" ; from armips - "-DUSE_DISCORD=OFF" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DUSE_SYSTEM_ZSTD=ON" - ;; for testing - "-DUNITTEST=ON" "-DHEADLESS=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'add-external-sources - (lambda* (#:key inputs #:allow-other-keys) - ;; TODO: unbundle armips. - (copy-recursively #$(package-source armips) "ext/armips"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin/ppsspp (string-append out "/bin/ppsspp")) - (share (string-append out "/share/ppsspp"))) - (copy-recursively "icons/hicolor" - (string-append out "/share/icons/hicolor")) - (install-file "PPSSPPSDL" share) - (copy-recursively "assets" (string-append share "/assets")) - - (make-desktop-entry-file - (string-append out "/share/applications/ppsspp.desktop") - #:name "PPSSPP" - #:exec (string-append share "/PPSSPPSDL") - #:icon "ppsspp") - (mkdir-p (string-append out "/bin")) - (with-output-to-file bin/ppsspp - (lambda () - (format #t "#!~a~%exec ~a/PPSSPPSDL \"$@\"" - (search-input-file inputs "/bin/bash") share))) - (chmod bin/ppsspp #o755))))))) - (home-page "https://www.ppsspp.org/") - (synopsis "PSP emulator") - (description - "PPSSPP is a ``high-level'' emulator simulating the PSP operating -system.") - (license license:gpl2+))) - (define-public exomizer (package (name "exomizer") diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch deleted file mode 100644 index 4d381b004d..0000000000 --- a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch +++ /dev/null @@ -1,527 +0,0 @@ -From 82e98cf24808754578ab26adef5c33acc949f75e Mon Sep 17 00:00:00 2001 -From: Liliana Marie Prikler -Date: Sat, 5 Jun 2021 22:47:00 -0400 -Subject: [PATCH] ppsspp: Remove upgrade code and gold support. - -Original patch from Liliana Marie Prikler. -Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by -Maxim Cournoyer. -Revised again by Liliana Marie Prikler for versions 1.12.3 and 1.14.4. ---- - Common/System/System.h | 1 - - Core/Config.cpp | 12 ------- - Core/Config.h | 2 -- - Qt/QtMain.cpp | 6 ---- - Qt/mainwindow.cpp | 6 ---- - Qt/mainwindow.h | 1 - - SDL/SDLMain.cpp | 6 ---- - UI/DevScreens.cpp | 3 -- - UI/GameSettingsScreen.cpp | 2 -- - UI/MainScreen.cpp | 71 +------------------------------------ - UI/MemStickScreen.cpp | 8 ----- - UI/MiscScreens.cpp | 33 +++-------------- - UWP/PPSSPP_UWPMain.cpp | 6 ---- - Windows/MainWindowMenu.cpp | 8 +---- - Windows/main.cpp | 6 ---- - Windows/resource.h | 1 - - android/jni/app-android.cpp | 6 ---- - ios/main.mm | 6 ---- - 18 files changed, 6 insertions(+), 178 deletions(-) - -diff --git a/Common/System/System.h b/Common/System/System.h -index 6f1524ab0..cbc51c840 100644 ---- a/Common/System/System.h -+++ b/Common/System/System.h -@@ -91,7 +91,6 @@ enum SystemProperty { - SYSPROP_DISPLAY_SAFE_INSET_BOTTOM, - - SYSPROP_DEVICE_TYPE, -- SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar. - - // Exposed on Android. Choosing the optimal sample rate for audio - // will result in lower latencies. Buffer size is automatically matched -diff --git a/Core/Config.cpp b/Core/Config.cpp -index 4971f9a8d..8a8386c0a 100644 ---- a/Core/Config.cpp -+++ b/Core/Config.cpp -@@ -534,7 +534,6 @@ static ConfigSetting generalSettings[] = { - ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), - ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), - ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), -- ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true), - ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), - ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), - ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... -@@ -1453,17 +1452,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { - upgradeMessage.clear(); - } - -- // Check for new version on every 10 runs. -- // Sometimes the download may not be finished when the main screen shows (if the user dismisses the -- // splash screen quickly), but then we'll just show the notification next time instead, we store the -- // upgrade number in the ini. -- if (iRunCount % 10 == 0 && bCheckForNewVersion) { -- const char *versionUrl = "http://www.ppsspp.org/version.json"; -- const char *acceptMime = "application/json, text/*; q=0.9, */*; q=0.8"; -- auto dl = g_DownloadManager.StartDownloadWithCallback(versionUrl, Path(), &DownloadCompletedCallback, acceptMime); -- dl->SetHidden(true); -- } -- - INFO_LOG(LOADER, "Loading controller config: %s", controllerIniFilename_.c_str()); - bSaveSettings = true; - -diff --git a/Core/Config.h b/Core/Config.h -index 8f10a5089..5e4054be1 100644 ---- a/Core/Config.h -+++ b/Core/Config.h -@@ -113,7 +113,6 @@ struct Config { - - bool bFastMemory; - int iCpuCore; -- bool bCheckForNewVersion; - bool bForceLagSync; - bool bFuncReplacements; - bool bHideSlowWarnings; -@@ -596,4 +595,3 @@ std::string CreateRandMAC(); - // TODO: Find a better place for this. - extern http::Downloader g_DownloadManager; - extern Config g_Config; -- -diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp -index f5a930061..d966d79ea 100644 ---- a/Qt/QtMain.cpp -+++ b/Qt/QtMain.cpp -@@ -238,12 +238,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return true; - case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR: - return true; // FileUtil.cpp: OpenFileInEditor -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return true; - case SYSPROP_HAS_KEYBOARD: -diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp -index 26707a76e..aae5fe133 100644 ---- a/Qt/mainwindow.cpp -+++ b/Qt/mainwindow.cpp -@@ -421,11 +421,6 @@ void MainWindow::forumAct() - QDesktopServices::openUrl(QUrl("https://forums.ppsspp.org/")); - } - --void MainWindow::goldAct() --{ -- QDesktopServices::openUrl(QUrl("https://central.ppsspp.org/buygold")); --} -- - void MainWindow::gitAct() - { - QDesktopServices::openUrl(QUrl("https://github.com/hrydgard/ppsspp/")); -@@ -673,7 +668,6 @@ void MainWindow::createMenus() - MenuTree* helpMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Help")); - helpMenu->add(new MenuAction(this, SLOT(websiteAct()), QT_TR_NOOP("Visit www.&ppsspp.org"))); - helpMenu->add(new MenuAction(this, SLOT(forumAct()), QT_TR_NOOP("PPSSPP &forums"))); -- helpMenu->add(new MenuAction(this, SLOT(goldAct()), QT_TR_NOOP("Buy &Gold"))); - helpMenu->add(new MenuAction(this, SLOT(gitAct()), QT_TR_NOOP("Git&Hub"))); - helpMenu->add(new MenuAction(this, SLOT(discordAct()), QT_TR_NOOP("Discord"))); - helpMenu->addSeparator(); -diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h -index 705a3dd00..4c8abe452 100644 ---- a/Qt/mainwindow.h -+++ b/Qt/mainwindow.h -@@ -189,7 +189,6 @@ private slots: - // Help - void websiteAct(); - void forumAct(); -- void goldAct(); - void gitAct(); - void discordAct(); - void aboutAct(); -diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp -index 415860069..a8a2285be 100644 ---- a/SDL/SDLMain.cpp -+++ b/SDL/SDLMain.cpp -@@ -415,12 +415,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - switch (prop) { - case SYSPROP_HAS_BACK_BUTTON: - return true; -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return true; - case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR: -diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp -index 568cc7c2f..051f147e2 100644 ---- a/UI/DevScreens.cpp -+++ b/UI/DevScreens.cpp -@@ -691,9 +691,6 @@ void SystemInfoScreen::CreateViews() { - #ifdef _M_SSE - buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); - #endif -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- buildConfig->Add(new InfoItem("GOLD", "")); -- } - - ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); - cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); -diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp -index e0d12bc97..1e63d5d9d 100644 ---- a/UI/GameSettingsScreen.cpp -+++ b/UI/GameSettingsScreen.cpp -@@ -1004,8 +1004,6 @@ void GameSettingsScreen::CreateViews() { - } - } - #endif -- systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); -- - systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings); - systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups"))); - static const char *autoLoadSaveStateChoices[] = { "Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5" }; -diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp -index cc273ebbd..6623025de 100644 ---- a/UI/MainScreen.cpp -+++ b/UI/MainScreen.cpp -@@ -1111,11 +1111,7 @@ void MainScreen::CreateViews() { - sprintf(versionString, "%s", PPSSPP_GIT_VERSION); - rightColumnItems->SetSpacing(0.0f); - AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false)); -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- logos->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); -- } else { -- logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); -- } -+ logos->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - logos->Add(new ImageView(ImageID("I_LOGO"), "PPSSPP", IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false))); - - #if !defined(MOBILE_DEVICE) -@@ -1140,12 +1136,6 @@ void MainScreen::CreateViews() { - rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); - rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); - -- if (!System_GetPropertyBool(SYSPROP_APP_GOLD) && (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR)) { -- Choice *gold = rightColumnItems->Add(new Choice(mm->T("Buy PPSSPP Gold"))); -- gold->OnClick.Handle(this, &MainScreen::OnSupport); -- gold->SetIcon(ImageID("I_ICONGOLD"), 0.5f); -- } -- - #if !PPSSPP_PLATFORM(UWP) - // Having an exit button is against UWP guidelines. - rightColumnItems->Add(new Spacer(25.0)); -@@ -1169,32 +1159,6 @@ void MainScreen::CreateViews() { - } else if (tabHolder_->GetVisibility() != V_GONE) { - root_->SetDefaultFocusView(tabHolder_); - } -- -- auto u = GetI18NCategory("Upgrade"); -- -- upgradeBar_ = 0; -- if (!g_Config.upgradeMessage.empty()) { -- upgradeBar_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); -- -- UI::Margins textMargins(10, 5); -- UI::Margins buttonMargins(0, 0); -- UI::Drawable solid(0xFFbd9939); -- upgradeBar_->SetBG(solid); -- upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); --#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(WINDOWS) -- upgradeBar_->Add(new Button(u->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); --#else -- upgradeBar_->Add(new Button(u->T("Details"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); --#endif -- upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade); -- -- // Slip in under root_ -- LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL); -- newRoot->Add(root_); -- newRoot->Add(upgradeBar_); -- root_->ReplaceLayoutParams(new LinearLayoutParams(1.0)); -- root_ = newRoot; -- } - } - - UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { -@@ -1202,30 +1166,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { - return UI::EVENT_DONE; - } - --UI::EventReturn MainScreen::OnDownloadUpgrade(UI::EventParams &e) { --#if PPSSPP_PLATFORM(ANDROID) -- // Go to app store -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); -- } else { -- LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); -- } --#elif PPSSPP_PLATFORM(WINDOWS) -- LaunchBrowser("https://www.ppsspp.org/downloads.html"); --#else -- // Go directly to ppsspp.org and let the user sort it out -- // (for details and in case downloads doesn't have their platform.) -- LaunchBrowser("https://www.ppsspp.org/"); --#endif -- return UI::EVENT_DONE; --} -- --UI::EventReturn MainScreen::OnDismissUpgrade(UI::EventParams &e) { -- g_Config.DismissUpgrade(); -- upgradeBar_->SetVisibility(UI::V_GONE); -- return UI::EVENT_DONE; --} -- - void MainScreen::sendMessage(const char *message, const char *value) { - // Always call the base class method first to handle the most common messages. - UIScreenWithBackground::sendMessage(message, value); -@@ -1392,15 +1332,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { - return UI::EVENT_DONE; - } - --UI::EventReturn MainScreen::OnSupport(UI::EventParams &e) { --#ifdef __ANDROID__ -- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); --#else -- LaunchBrowser("https://central.ppsspp.org/buygold"); --#endif -- return UI::EVENT_DONE; --} -- - UI::EventReturn MainScreen::OnPPSSPPOrg(UI::EventParams &e) { - LaunchBrowser("https://www.ppsspp.org"); - return UI::EVENT_DONE; -diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp -index 374c4683a..4a3d54155 100644 ---- a/UI/MemStickScreen.cpp -+++ b/UI/MemStickScreen.cpp -@@ -157,23 +157,16 @@ static void AddExplanation(UI::ViewGroup *viewGroup, MemStickScreen::Choice choi - case MemStickScreen::CHOICE_STORAGE_ROOT: - // Old school choice - holder->Add(new TextView(iz->T("DataWillStay", "Data will stay even if you uninstall PPSSPP"), flags, false))->SetBullet(true); -- holder->Add(new TextView(iz->T("DataCanBeShared", "Data can be shared between PPSSPP regular/Gold"), flags, false))->SetBullet(true); - holder->Add(new TextView(iz->T("EasyUSBAccess", "Easy USB access"), flags, false))->SetBullet(true); - break; - case MemStickScreen::CHOICE_BROWSE_FOLDER: - holder->Add(new TextView(iz->T("DataWillStay", "Data will stay even if you uninstall PPSSPP"), flags, false))->SetBullet(true); -- holder->Add(new TextView(iz->T("DataCanBeShared", "Data can be shared between PPSSPP regular/Gold"), flags, false))->SetBullet(true); - holder->Add(new TextView(iz->T("EasyUSBAccess", "Easy USB access"), flags, false))->SetBullet(true); - break; - case MemStickScreen::CHOICE_PRIVATE_DIRECTORY: - // Consider https://www.compart.com/en/unicode/U+26A0 (unicode warning sign?)? or a graphic? - holder->Add(new TextView(iz->T("DataWillBeLostOnUninstall", "Warning! Data will be lost when you uninstall PPSSPP!"), flags, false))->SetBullet(true); -- holder->Add(new TextView(iz->T("DataCannotBeShared", "Data CANNOT be shared between PPSSPP regular/Gold!"), flags, false))->SetBullet(true); --#if GOLD -- holder->Add(new TextView(iz->T("USBAccessThroughGold", "USB access through Android/data/org.ppsspp.ppssppgold/files"), flags, false))->SetBullet(true); --#else - holder->Add(new TextView(iz->T("USBAccessThrough", "USB access through Android/data/org.ppsspp.ppsspp/files"), flags, false))->SetBullet(true); --#endif - break; - case MemStickScreen::CHOICE_SET_MANUAL: - default: -@@ -243,7 +236,6 @@ void MemStickScreen::CreateViews() { - } else { - leftColumn->Add(new RadioButton(&choice_, CHOICE_SET_MANUAL, iz->T("Manually specify PSP folder")))->OnClick.Handle(this, &MemStickScreen::OnChoiceClick); - leftColumn->Add(new TextView(iz->T("DataWillStay", "Data will stay even if you uninstall PPSSPP.")))->SetBullet(true); -- leftColumn->Add(new TextView(iz->T("DataCanBeShared", "Data can be shared between PPSSPP regular/Gold.")))->SetBullet(true); - // TODO: Show current folder here if we have one set. - } - if (choice_ == CHOICE_BROWSE_FOLDER || choice_ == CHOICE_SET_MANUAL) { -diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp -index fef1fae1b..942997925 100644 ---- a/UI/MiscScreens.cpp -+++ b/UI/MiscScreens.cpp -@@ -657,7 +657,7 @@ void NewLanguageScreen::OnCompleted(DialogResult result) { - g_Config.sLanguageIni = code; - - bool iniLoadedSuccessfully = false; -- // Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to -+ // Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to - // test new languages without recompiling the entire app, which is a hassle). - const Path langOverridePath = GetSysDirectory(DIRECTORY_SYSTEM) / "lang"; - -@@ -781,11 +781,7 @@ void LogoScreen::render() { - char temp[256]; - // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. - snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- dc.Draw()->DrawImage(ImageID("I_ICONGOLD"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER); -- } else { -- dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER); -- } -+ dc.Draw()->DrawImage(ImageID("I_ICON"), bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, 0xFFFFFFFF, ALIGN_CENTER); - dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, 0xFFFFFFFF, ALIGN_CENTER); - //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", bounds.w / 2, bounds.h / 2 - 30, textColor, ALIGN_CENTER); - dc.SetFontScale(1.0f, 1.0f); -@@ -821,10 +817,6 @@ void CreditsScreen::CreateViews() { - // Really need to redo this whole layout with some linear layouts... - - int rightYOffset = 0; -- if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- root_->Add(new Button(cr->T("Buy Gold"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport); -- rightYOffset = 74; -- } - root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); - root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); - root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); -@@ -833,20 +825,7 @@ void CreditsScreen::CreateViews() { - #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) - root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); - #endif -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- root_->Add(new ImageView(ImageID("I_ICONGOLD"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); -- } else { -- root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); -- } --} -- --UI::EventReturn CreditsScreen::OnSupport(UI::EventParams &e) { --#ifdef __ANDROID__ -- LaunchBrowser("market://details?id=org.ppsspp.ppssppgold"); --#else -- LaunchBrowser("https://central.ppsspp.org/buygold"); --#endif -- return UI::EVENT_DONE; -+ root_->Add(new ImageView(ImageID("I_ICON"), "", IS_DEFAULT, new AnchorLayoutParams(100, 64, 10, 10, NONE, NONE, false))); - } - - UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { -@@ -1033,11 +1012,7 @@ void CreditsScreen::render() { - - // TODO: This is kinda ugly, done on every frame... - char temp[256]; -- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION); -- } else { -- snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); -- } -+ snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION); - credits[0] = (const char *)temp; - - UIContext &dc = *screenManager()->getUIContext(); -diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp -index b734f6e3d..ef694fcd3 100644 ---- a/UWP/PPSSPP_UWPMain.cpp -+++ b/UWP/PPSSPP_UWPMain.cpp -@@ -418,12 +418,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return false; - case SYSPROP_HAS_BACK_BUTTON: - return true; -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return true; - case SYSPROP_HAS_KEYBOARD: -diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp -index 25af2cd08..19ffd0a52 100644 ---- a/Windows/MainWindowMenu.cpp -+++ b/Windows/MainWindowMenu.cpp -@@ -136,7 +136,6 @@ namespace MainWindow { - - const std::wstring visitMainWebsite = ConvertUTF8ToWString(des->T("www.ppsspp.org")); - const std::wstring visitForum = ConvertUTF8ToWString(des->T("PPSSPP Forums")); -- const std::wstring buyGold = ConvertUTF8ToWString(des->T("Buy Gold")); - const std::wstring gitHub = ConvertUTF8ToWString(des->T("GitHub")); - const std::wstring discord = ConvertUTF8ToWString(des->T("Discord")); - const std::wstring aboutPPSSPP = ConvertUTF8ToWString(des->T("About PPSSPP...")); -@@ -147,7 +146,6 @@ namespace MainWindow { - AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENWEBSITE, visitMainWebsite.c_str()); - AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENFORUM, visitForum.c_str()); - // Repeat the process for other languages, if necessary. -- AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_BUYGOLD, buyGold.c_str()); - AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_GITHUB, gitHub.c_str()); - AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_DISCORD, discord.c_str()); - AppendMenu(helpMenu, MF_SEPARATOR, 0, 0); -@@ -924,10 +922,6 @@ namespace MainWindow { - ShellExecute(NULL, L"open", L"https://www.ppsspp.org/", NULL, NULL, SW_SHOWNORMAL); - break; - -- case ID_HELP_BUYGOLD: -- ShellExecute(NULL, L"open", L"https://central.ppsspp.org/buygold", NULL, NULL, SW_SHOWNORMAL); -- break; -- - case ID_HELP_OPENFORUM: - ShellExecute(NULL, L"open", L"https://forums.ppsspp.org/", NULL, NULL, SW_SHOWNORMAL); - break; -@@ -1280,7 +1274,7 @@ namespace MainWindow { - { - W32Util::CenterWindow(hDlg); - HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); -- std::string windowText = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP "; -+ std::string windowText = "PPSSPP "; - windowText.append(PPSSPP_GIT_VERSION); - SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); - } -diff --git a/Windows/main.cpp b/Windows/main.cpp -index 9351202be..30c75e092 100644 ---- a/Windows/main.cpp -+++ b/Windows/main.cpp -@@ -333,12 +333,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return true; - case SYSPROP_HAS_BACK_BUTTON: - return true; -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return true; - case SYSPROP_HAS_KEYBOARD: -diff --git a/Windows/resource.h b/Windows/resource.h -index 83ef88957..bdaef6234 100644 ---- a/Windows/resource.h -+++ b/Windows/resource.h -@@ -339,7 +339,6 @@ - // Dummy option to let the buffered rendering hotkey cycle through all the options. - #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 - #define IDC_STEPOUT 40501 --#define ID_HELP_BUYGOLD 40502 - - #define IDC_STATIC -1 - -diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp -index 18ef723d4..61d8e5c2d 100644 ---- a/android/jni/app-android.cpp -+++ b/android/jni/app-android.cpp -@@ -480,12 +480,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return androidVersion >= 21; // when ACTION_OPEN_DOCUMENT_TREE was added - case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR: - return false; // Update if we add support in FileUtil.cpp: OpenFileInEditor -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return true; - case SYSPROP_ANDROID_SCOPED_STORAGE: -diff --git a/ios/main.mm b/ios/main.mm -index b10db1a79..c410befdc 100644 ---- a/ios/main.mm -+++ b/ios/main.mm -@@ -153,12 +153,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - switch (prop) { - case SYSPROP_HAS_BACK_BUTTON: - return false; -- case SYSPROP_APP_GOLD: --#ifdef GOLD -- return true; --#else -- return false; --#endif - case SYSPROP_CAN_JIT: - return get_debugged(); - --- -2.39.2 -