me
/
guix
Archived
1
0
Fork 0
Code

gnu: ppsspp: Update to 1.11.2. 

* gnu/packages/emulators.scm (ppsspp): Update to 1.11.2.
[snippet]: Adapt to changes in source code.
Unbundle miniupnp and MoltenVK.
[arguments]<#:phases>: Add fix-unittest-build.
Comment failing tests.
* gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Adapt to source.
master
Leo Prikler 2021-02-15 16:02:43 +01:00
parent 3b2d7ada40
commit a3084e1e06
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
2 changed files with 93 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/packages/emulators.scm
View File

@ -2094,7 +2094,7 @@ framework based on QEMU.")
(define-public ppsspp (define-public ppsspp
(package (package
(name "ppsspp") (name "ppsspp")
(version "1.10.3") (version "1.11.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2102,7 +2102,7 @@ framework based on QEMU.")
(url "https://github.com/hrydgard/ppsspp") (url "https://github.com/hrydgard/ppsspp")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0znxlbj6cfw7gn0naay0mzhc0k5saw8nrwpspcn7gap1023p06w2")) (base32 "03nxarx0l1ndi9fffl1wjfwsg3pk2bwf72cwcfaski1sg3dxsv7h"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (patches
(search-patches "ppsspp-disable-upgrade-and-gold.patch")) (search-patches "ppsspp-disable-upgrade-and-gold.patch"))
@ -2113,16 +2113,16 @@ framework based on QEMU.")
;; There are still a number of external sources, that we don't ;; There are still a number of external sources, that we don't
;; remove here. Some may be packaged, others are not. ;; remove here. Some may be packaged, others are not.
;; First, we patch existing sources to include the right headers. ;; First, we patch existing sources to include the right headers.
(substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp" (substitute* (append (find-files "Common" ".*\\.(h|cpp)")
"ext/native/thin3d/thin3d_vulkan.cpp")
(find-files "Common" ".*\\.(h|cpp)")
(find-files "Core" ".*\\.(h|cpp)") (find-files "Core" ".*\\.(h|cpp)")
(find-files "GPU" ".*\\.(h|cpp)") (find-files "GPU" ".*\\.(h|cpp)")
(find-files "SDL" ".*\\.(h|cpp)") (find-files "SDL" ".*\\.(h|cpp)")
(find-files "UI" ".*\\.(h|cpp)")) (find-files "UI" ".*\\.(h|cpp)"))
;; These headers are all hard-coded in the original source. ;; These headers are all hard-coded in the original source.
(("ext/cityhash/") "") (("ext/cityhash/") "")
(("ext/glslang/") "") (("ext/glslang/glslang/") "glslang/")
(("ext/glslang/") "glslang/")
(("ext/miniupnp/") "")
(("ext/SPIRV-Cross/") "spirv_cross/") (("ext/SPIRV-Cross/") "spirv_cross/")
(("ext/vulkan/") "vulkan/") (("ext/vulkan/") "vulkan/")
(("ext/xxhash.h") "xxhash.h") (("ext/xxhash.h") "xxhash.h")
@ -2145,7 +2145,12 @@ framework based on QEMU.")
;; Don't search for cityhash/xxhash, we already have them. ;; Don't search for cityhash/xxhash, we already have them.
(("add_library\\((city|xx)hash STATIC") "if()\nendif(") (("add_library\\((city|xx)hash STATIC") "if()\nendif(")
(("ext/xxhash\\.[ch]") "") (("ext/xxhash\\.[ch]") "")
(("ext/native/ext/cityhash/.*\\.(cpp|h)") "") (("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. ;; Link all of spirv-cross.
(("spirv-cross-glsl" all) (("spirv-cross-glsl" all)
(string-append all (string-append all
@ -2158,12 +2163,12 @@ framework based on QEMU.")
(("add_subdirectory\\(SPIRV-Cross-build\\)") "")) (("add_subdirectory\\(SPIRV-Cross-build\\)") ""))
;; Finally, we can delete the bundled sources. ;; Finally, we can delete the bundled sources.
(for-each delete-file-recursively (for-each delete-file-recursively
'("ext/cmake" '("MoltenVK"
"ext/cmake"
"ext/glew" "ext/glew"
"ext/glslang" "ext/glslang-build" "ext/glslang" "ext/glslang-build"
"ext/native/ext/cityhash" "ext/miniupnp" "ext/miniupnp-build"
"ext/native/ext/libpng17" "ext/native"
"ext/native/ext/libzip"
"ext/snappy" "ext/snappy"
"ext/SPIRV-Cross" "ext/SPIRV-Cross-build" "ext/SPIRV-Cross" "ext/SPIRV-Cross-build"
"ext/vulkan" "ext/vulkan"
@ -2186,6 +2191,7 @@ framework based on QEMU.")
("libpng" ,libpng) ("libpng" ,libpng)
("libzip" ,libzip) ("libzip" ,libzip)
("mesa" ,mesa) ("mesa" ,mesa)
("miniupnpc" ,miniupnpc)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("snappy" ,snappy) ("snappy" ,snappy)
("spirv-cross" ,spirv-cross) ("spirv-cross" ,spirv-cross)
@ -2196,24 +2202,24 @@ framework based on QEMU.")
;; TODO: unbundle armips. ;; TODO: unbundle armips.
("armips-source" ,(package-source armips)) ("armips-source" ,(package-source armips))
("lang" ("lang"
,(let ((commit "1c64b8fbd3cb6bd87935eb53f302f7de6f86e209")) ,(let ((commit "6bd5b4bc983917ea8402f73c726b46e36f3de0b4"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/hrydgard/ppsspp-lang") (url "https://github.com/hrydgard/ppsspp-lang")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "0rprn3yd8xfrvi0fm62sgpqa8n73jk7zmlscp8cp0h2fawqpiamd")) (base32 "08npr3a4xskf85gnlxidl4ksc3rhc7m5rgnj7vsbjvhvw5ap02qx"))
(file-name (git-file-name "ppsspp-lang" commit))))) (file-name (git-file-name "ppsspp-lang" commit)))))
("tests" ("tests"
,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7")) ,(let ((commit "1047400eaec6bcbdb2a64d326375ef6a6617c4ac"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/hrydgard/pspautotests") (url "https://github.com/hrydgard/pspautotests")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")) (base32 "0nxv1lskcr8zbg6nrfai21mxsw0n5vaqhbsa41c3cxfyx5c4w2pg"))
(file-name (git-file-name "pspautotests" commit))))))) (file-name (git-file-name "pspautotests" commit)))))))
(arguments (arguments
`(#:out-of-source? #f `(#:out-of-source? #f
@ -2236,13 +2242,23 @@ framework based on QEMU.")
(copy-recursively (assoc-ref inputs "lang") (copy-recursively (assoc-ref inputs "lang")
"assets/lang") "assets/lang")
#t)) #t))
(add-after 'unpack 'fix-unittest-build
(lambda _
(substitute* "CMakeLists.txt"
(("unittest/TestVertexJit.cpp" all)
(string-append all " unittest/TestShaderGenerators.cpp")))
(substitute* "unittest/TestVertexJit.cpp"
(("#include \"unittest/UnitTest.h\"" all)
(string-append all "\n#include <cmath>")))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
(for-each (for-each
(lambda (t) (invoke "./unitTest" t)) (lambda (t) (invoke "./unitTest" t))
'("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin" '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin"
"SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit" "SinCos" #|"VFPUSinCos" SIGSEGV|# "MathUtil" "Parsers" "Jit"
"MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap")) "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ"
#|"ShaderGenerators"|#))
(invoke "python3" "test.py" "-g") (invoke "python3" "test.py" "-g")
#t)) #t))
(replace 'install (replace 'install

113
gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch
View File

@ -1,28 +1,28 @@
From 951f2269f67d618d376656db831796c119f4f6b3 Mon Sep 17 00:00:00 2001 From 0c57874ebb5982154da127ae338f9190b1581804 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at> From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Fri, 26 Jun 2020 18:20:04 +0200 Date: Fri, 26 Jun 2020 18:20:04 +0200
Subject: [PATCH] ppsspp: disable upgrade and gold Subject: [PATCH] ppsspp: disable upgrade and gold
--- ---
Core/Config.cpp | 11 ------- Core/Config.cpp | 11 ------
Core/Config.h | 2 -- Core/Config.h | 2 --
Qt/QtMain.cpp | 6 ---- Qt/QtMain.cpp | 6 ----
SDL/SDLMain.cpp | 6 ---- SDL/SDLMain.cpp | 6 ----
UI/DevScreens.cpp | 3 -- UI/DevScreens.cpp | 3 --
UI/GameSettingsScreen.cpp | 1 - UI/GameSettingsScreen.cpp | 1 -
UI/MainScreen.cpp | 63 +------------------------------------ UI/MainScreen.cpp | 70 +------------------------------------
UI/MiscScreens.cpp | 31 ++---------------- UI/MiscScreens.cpp | 31 ++--------------
UWP/PPSSPP_UWPMain.cpp | 6 ---- UWP/PPSSPP_UWPMain.cpp | 6 ----
Windows/MainWindowMenu.cpp | 2 +- Windows/MainWindowMenu.cpp | 2 +-
Windows/main.cpp | 6 ---- Windows/main.cpp | 6 ----
android/jni/app-android.cpp | 6 ---- android/jni/app-android.cpp | 6 ----
12 files changed, 5 insertions(+), 138 deletions(-) 12 files changed, 5 insertions(+), 145 deletions(-)
diff --git a/Core/Config.cpp b/Core/Config.cpp diff --git a/Core/Config.cpp b/Core/Config.cpp
index 214aeb433..04e3b151d 100644 index 1c53e8e57..2fa74a6b8 100644
--- a/Core/Config.cpp --- a/Core/Config.cpp
+++ b/Core/Config.cpp +++ b/Core/Config.cpp
@@ -428,7 +428,6 @@ static ConfigSetting generalSettings[] = { @@ -439,7 +439,6 @@ static ConfigSetting generalSettings[] = {
ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true),
ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""),
ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false),
@ -30,7 +30,7 @@ index 214aeb433..04e3b151d 100644
ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion),
ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), 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... ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound...
@@ -1229,16 +1228,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { @@ -1293,16 +1292,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
upgradeMessage = ""; upgradeMessage = "";
} }
@ -48,29 +48,29 @@ index 214aeb433..04e3b151d 100644
bSaveSettings = true; bSaveSettings = true;
diff --git a/Core/Config.h b/Core/Config.h diff --git a/Core/Config.h b/Core/Config.h
index 084eacc94..e7134cab5 100644 index 13bce8a36..70d6c8aaf 100644
--- a/Core/Config.h --- a/Core/Config.h
+++ b/Core/Config.h +++ b/Core/Config.h
@@ -99,7 +99,6 @@ struct Config { @@ -101,7 +101,6 @@ struct Config {
bool bIgnoreBadMemAccess;
bool bFastMemory; bool bFastMemory;
int iCpuCore; int iCpuCore;
- bool bCheckForNewVersion; - bool bCheckForNewVersion;
bool bForceLagSync; bool bForceLagSync;
bool bFuncReplacements; bool bFuncReplacements;
bool bHideSlowWarnings; bool bHideSlowWarnings;
@@ -521,4 +520,3 @@ std::string CreateRandMAC(); @@ -540,4 +539,3 @@ std::string CreateRandMAC();
// TODO: Find a better place for this. // TODO: Find a better place for this.
extern http::Downloader g_DownloadManager; extern http::Downloader g_DownloadManager;
extern Config g_Config; extern Config g_Config;
- -
diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
index 7713b6587..1d92d1175 100644 index 5be0cefa0..b11cb1c64 100644
--- a/Qt/QtMain.cpp --- a/Qt/QtMain.cpp
+++ b/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp
@@ -194,12 +194,6 @@ bool System_GetPropertyBool(SystemProperty prop) { @@ -218,12 +218,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true;
case SYSPROP_HAS_FILE_BROWSER: case SYSPROP_HAS_FILE_BROWSER:
case SYSPROP_HAS_FOLDER_BROWSER:
return true; return true;
- case SYSPROP_APP_GOLD: - case SYSPROP_APP_GOLD:
-#ifdef GOLD -#ifdef GOLD
@ -82,10 +82,10 @@ index 7713b6587..1d92d1175 100644
return false; return false;
} }
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 52028d087..d8697d210 100644 index 98b56fe91..6af0fcb1a 100644
--- a/SDL/SDLMain.cpp --- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp
@@ -356,12 +356,6 @@ bool System_GetPropertyBool(SystemProperty prop) { @@ -380,12 +380,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) { switch (prop) {
case SYSPROP_HAS_BACK_BUTTON: case SYSPROP_HAS_BACK_BUTTON:
return true; return true;
@ -99,10 +99,10 @@ index 52028d087..d8697d210 100644
return false; return false;
} }
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index f146d099e..625ee124c 100644 index 8daac5bc8..c0c09ce79 100644
--- a/UI/DevScreens.cpp --- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp
@@ -603,9 +603,6 @@ void SystemInfoScreen::CreateViews() { @@ -605,9 +605,6 @@ void SystemInfoScreen::CreateViews() {
#ifdef _M_SSE #ifdef _M_SSE
buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE)));
#endif #endif
@ -113,35 +113,35 @@ index f146d099e..625ee124c 100644
ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt");
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 8202870c7..81112f822 100644 index 2f1e157ee..38c586b06 100644
--- a/UI/GameSettingsScreen.cpp --- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp
@@ -796,7 +796,6 @@ void GameSettingsScreen::CreateViews() { @@ -914,7 +914,6 @@ void GameSettingsScreen::CreateViews() {
}
} }
#endif #endif
- systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); - systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP")));
const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png"; const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png";
const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg"; const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg";
if (File::Exists(bgPng) || File::Exists(bgJpg)) { if (File::Exists(bgPng) || File::Exists(bgJpg)) {
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 43535913d..36834020d 100644 index ca870ab8f..84cde88ac 100644
--- a/UI/MainScreen.cpp --- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp
@@ -1054,11 +1054,7 @@ void MainScreen::CreateViews() { @@ -1064,11 +1064,7 @@ void MainScreen::CreateViews() {
sprintf(versionString, "%s", PPSSPP_GIT_VERSION); sprintf(versionString, "%s", PPSSPP_GIT_VERSION);
rightColumnItems->SetSpacing(0.0f); rightColumnItems->SetSpacing(0.0f);
LinearLayout *logos = new LinearLayout(ORIENT_HORIZONTAL); AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false));
- if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) {
- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); - logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false)));
- } else { - } else {
- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, 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_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, 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"), IS_DEFAULT, new LinearLayoutParams(Margins(-12, 0, 0, 0)))); logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false)));
rightColumnItems->Add(logos);
TextView *ver = rightColumnItems->Add(new TextView(versionString, new LinearLayoutParams(Margins(70, -6, 0, 0)))); #if !defined(MOBILE_DEVICE)
@@ -1070,11 +1066,6 @@ void MainScreen::CreateViews() { @@ -1089,11 +1085,6 @@ void MainScreen::CreateViews() {
rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings);
rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); 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); rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
@ -153,7 +153,7 @@ index 43535913d..36834020d 100644
#if !PPSSPP_PLATFORM(UWP) #if !PPSSPP_PLATFORM(UWP)
// Having an exit button is against UWP guidelines. // Having an exit button is against UWP guidelines.
@@ -1099,28 +1090,6 @@ void MainScreen::CreateViews() { @@ -1118,32 +1109,6 @@ void MainScreen::CreateViews() {
} else if (tabHolder_->GetVisibility() != V_GONE) { } else if (tabHolder_->GetVisibility() != V_GONE) {
root_->SetDefaultFocusView(tabHolder_); root_->SetDefaultFocusView(tabHolder_);
} }
@ -169,7 +169,11 @@ index 43535913d..36834020d 100644
- UI::Drawable solid(0xFFbd9939); - UI::Drawable solid(0xFFbd9939);
- upgradeBar_->SetBG(solid); - upgradeBar_->SetBG(solid);
- upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); - 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); - 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); - upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade);
- -
- // Slip in under root_ - // Slip in under root_
@ -182,7 +186,7 @@ index 43535913d..36834020d 100644
} }
UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) {
@@ -1128,27 +1097,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { @@ -1151,30 +1116,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) {
return UI::EVENT_DONE; return UI::EVENT_DONE;
} }
@ -194,9 +198,12 @@ index 43535913d..36834020d 100644
- } else { - } else {
- LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); - LaunchBrowser("market://details?id=org.ppsspp.ppsspp");
- } - }
-#elif PPSSPP_PLATFORM(WINDOWS)
- LaunchBrowser("https://www.ppsspp.org/downloads.html");
-#else -#else
- // Go directly to ppsspp.org and let the user sort it out - // Go directly to ppsspp.org and let the user sort it out
- LaunchBrowser("https://www.ppsspp.org/downloads.html"); - // (for details and in case downloads doesn't have their platform.)
- LaunchBrowser("https://www.ppsspp.org/");
-#endif -#endif
- return UI::EVENT_DONE; - return UI::EVENT_DONE;
-} -}
@ -210,7 +217,7 @@ index 43535913d..36834020d 100644
void MainScreen::sendMessage(const char *message, const char *value) { void MainScreen::sendMessage(const char *message, const char *value) {
// Always call the base class method first to handle the most common messages. // Always call the base class method first to handle the most common messages.
UIScreenWithBackground::sendMessage(message, value); UIScreenWithBackground::sendMessage(message, value);
@@ -1319,15 +1267,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { @@ -1390,15 +1331,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) {
return UI::EVENT_DONE; return UI::EVENT_DONE;
} }
@ -227,10 +234,10 @@ index 43535913d..36834020d 100644
LaunchBrowser("https://www.ppsspp.org"); LaunchBrowser("https://www.ppsspp.org");
return UI::EVENT_DONE; return UI::EVENT_DONE;
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index a6542c65d..f5f101594 100644 index a7284654b..2413d6c89 100644
--- a/UI/MiscScreens.cpp --- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp
@@ -498,11 +498,7 @@ void LogoScreen::render() { @@ -539,11 +539,7 @@ void LogoScreen::render() {
char temp[256]; char temp[256];
// Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. // 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); snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5);
@ -243,7 +250,7 @@ index a6542c65d..f5f101594 100644
dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER);
//dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER); //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER);
dc.SetFontScale(1.0f, 1.0f); dc.SetFontScale(1.0f, 1.0f);
@@ -538,10 +534,6 @@ void CreditsScreen::CreateViews() { @@ -579,10 +575,6 @@ void CreditsScreen::CreateViews() {
// Really need to redo this whole layout with some linear layouts... // Really need to redo this whole layout with some linear layouts...
int rightYOffset = 0; int rightYOffset = 0;
@ -254,7 +261,7 @@ index a6542c65d..f5f101594 100644
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("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(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); root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg);
@@ -550,20 +542,7 @@ void CreditsScreen::CreateViews() { @@ -591,20 +583,7 @@ void CreditsScreen::CreateViews() {
#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) #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); root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare);
#endif #endif
@ -276,7 +283,7 @@ index a6542c65d..f5f101594 100644
} }
UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) {
@@ -747,11 +726,7 @@ void CreditsScreen::render() { @@ -794,11 +773,7 @@ void CreditsScreen::render() {
// TODO: This is kinda ugly, done on every frame... // TODO: This is kinda ugly, done on every frame...
char temp[256]; char temp[256];
@ -290,10 +297,10 @@ index a6542c65d..f5f101594 100644
UIContext &dc = *screenManager()->getUIContext(); UIContext &dc = *screenManager()->getUIContext();
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 24f3b964d..1d66ba7ee 100644 index 0ba7fac4b..d1b687c47 100644
--- a/UWP/PPSSPP_UWPMain.cpp --- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp
@@ -399,12 +399,6 @@ bool System_GetPropertyBool(SystemProperty prop) { @@ -433,12 +433,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return false; return false;
case SYSPROP_HAS_BACK_BUTTON: case SYSPROP_HAS_BACK_BUTTON:
return true; return true;
@ -307,10 +314,10 @@ index 24f3b964d..1d66ba7ee 100644
return false; return false;
} }
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index b5e1bb0eb..71b29b48a 100644 index 979a60ecb..a57927544 100644
--- a/Windows/MainWindowMenu.cpp --- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp
@@ -1377,7 +1377,7 @@ namespace MainWindow { @@ -1393,7 +1393,7 @@ namespace MainWindow {
{ {
W32Util::CenterWindow(hDlg); W32Util::CenterWindow(hDlg);
HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); HWND versionBox = GetDlgItem(hDlg, IDC_VERSION);
@ -320,10 +327,10 @@ index b5e1bb0eb..71b29b48a 100644
SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str());
} }
diff --git a/Windows/main.cpp b/Windows/main.cpp diff --git a/Windows/main.cpp b/Windows/main.cpp
index 3795597e2..fd98d0453 100644 index 4d948cfe5..e609cc1e0 100644
--- a/Windows/main.cpp --- a/Windows/main.cpp
+++ b/Windows/main.cpp +++ b/Windows/main.cpp
@@ -268,12 +268,6 @@ bool System_GetPropertyBool(SystemProperty prop) { @@ -301,12 +301,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true; return true;
case SYSPROP_HAS_BACK_BUTTON: case SYSPROP_HAS_BACK_BUTTON:
return true; return true;
@ -337,13 +344,13 @@ index 3795597e2..fd98d0453 100644
return false; return false;
} }
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 086371085..0a340c0ae 100644 index 10fdf97e5..736b1fa66 100644
--- a/android/jni/app-android.cpp --- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp
@@ -372,12 +372,6 @@ bool System_GetPropertyBool(SystemProperty prop) { @@ -437,12 +437,6 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true; case SYSPROP_HAS_FOLDER_BROWSER:
case SYSPROP_HAS_IMAGE_BROWSER: // Uses OPEN_DOCUMENT_TREE to let you select a folder.
return true; return androidVersion >= 21;
- case SYSPROP_APP_GOLD: - case SYSPROP_APP_GOLD:
-#ifdef GOLD -#ifdef GOLD
- return true; - return true;
@ -354,5 +361,5 @@ index 086371085..0a340c0ae 100644
return false; return false;
} }
-- --
2.26.2 2.30.1