From 12daebcd5c088aaa907cf2a69e41260189ae5f59 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Thu, 11 Aug 2022 20:49:20 +0700 Subject: [PATCH] IPA build: use W^X JIT-enabled runtime Finally, we managed to get W^X JIT working. The game will now run at full speed, without having to jailbreak the device. More info: https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/re leases/tag/jre8-40df388 --- Makefile | 13 +++++++------ Natives/en.lproj/Localizable.strings | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c03702aa..29adcdbf 100644 --- a/Makefile +++ b/Makefile @@ -324,17 +324,18 @@ dsym: deb ipa: dsym echo 'Building PojavLauncher $(VERSION) - IPA - Start' - $(call DIRCHECK,$(SOURCEDIR)/depends); \ + mkdir -p $(SOURCEDIR)/depends; \ cd $(SOURCEDIR)/depends; \ - wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-99f3f8b/jre8-zero-aarch64-ios.tar.xz'; \ - tar xvf jre8-zero-aarch64-ios.tar.xz; \ - rm jre8-zero-aarch64-ios.tar.xz; \ + if [ ! -d "java-8-openjdk" ]; then \ + wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz'; \ + tar xvf jre8-zero-aarch64-ios.tar.xz; \ + rm jre8-zero-aarch64-ios.tar.xz; \ + fi; \ mkdir -p $(OUTPUTDIR); \ cd $(OUTPUTDIR); \ $(call DIRCHECK,$(OUTPUTDIR)/Payload); \ cp -R $(POJAV_BUNDLE_DIR) $(OUTPUTDIR)/Payload; \ - rm -rf $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm; \ - mkdir $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm; \ + $(call DIRCHECK,$(OUTPUTDIR)/Payload/PojavLauncher.app/jvm); \ cp -R $(POJAV_JRE8_DIR) $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/; \ rm -rf $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/*/{bin,include,jre,lib/{ct.sym,libjsig.dylib,src.zip,tools.jar}}; \ ldid -S$(SOURCEDIR)/entitlements_ipa.xml $(OUTPUTDIR)/Payload/PojavLauncher.app/PojavLauncher; \ diff --git a/Natives/en.lproj/Localizable.strings b/Natives/en.lproj/Localizable.strings index 77e02171..bd05b920 100644 --- a/Natives/en.lproj/Localizable.strings +++ b/Natives/en.lproj/Localizable.strings @@ -31,8 +31,8 @@ "login.progress.title" = "Logging in"; -"login.warn.title.int" = "This build of PojavLauncher is for testing purposes."; -"login.warn.message.int" = "Being the first builds of PojavLauncher for unjailbroken devices, there may be unexpected bugs and issues with the launcher. It also uses an interpreter rather than JIT compilation to run the game, so performance will be heavily decreased until we can fix this issue."; +"login.warn.title.ipa" = "This build of PojavLauncher is for testing purposes."; +"login.warn.message.ipa" = "Being the first builds of PojavLauncher for unjailbroken devices, there may be unexpected bugs and issues with the launcher."; "login.warn.title.a7" = "This is the last update for this device."; "login.warn.message.a7" = "Your device will not support PojavLauncher 2.2. This change is due to hardware and software limitations.";