From fa62e8d268eaff0706010358ca75ede52a9423f5 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Wed, 4 Aug 2021 05:30:29 +0700 Subject: [PATCH 1/2] Correct how Makefile set debug mode --- Makefile | 13 +++++++++++-- Natives/AboutLauncherViewController.m | 2 +- Natives/CMakeLists.txt | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ed0ff2e8..b35c4b94 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,14 @@ DETECT := $(shell clang -v 2>&1 | grep Target | cut -b 9-60) # version 1.3 on iPhone9,1 running 14.6 VERSION := $(shell cat DEBIAN/control | grep Version | cut -b 9-60) COMMIT := $(shell git log --oneline | sed '2,10000000d' | cut -b 1-7) +ifndef RELEASE +RELEASE := 0 +endif +ifeq ($(filter 1,$(RELEASE)),) +CMAKE_BUILD_TYPE := RelWithDebInfo +else +CMAKE_BUILD_TYPE := Debug +endif # Distinguish iOS from macOS ifneq ($(filter arm64-apple-ios%,$(DETECT)),) @@ -97,7 +105,7 @@ native: @echo 'Starting build task - native application' @mkdir -p Natives/build @cd Natives/build && cmake . \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ -DCMAKE_CROSSCOMPILING=true \ -DCMAKE_SYSTEM_NAME=Darwin \ -DCMAKE_SYSTEM_PROCESSOR=aarch64 \ @@ -105,8 +113,9 @@ native: -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_C_FLAGS="-arch arm64 -miphoneos-version-min=12.0" \ -DCONFIG_COMMIT="$(COMMIT)" \ + -DCONFIG_RELEASE=$(RELEASE) \ .. - @cd Natives/build && cmake --build . --config Release --target awt_headless awt_xawt pojavexec PojavLauncher + @cd Natives/build && cmake --build . --config $(CMAKE_BUILD_TYPE) --target awt_headless awt_xawt pojavexec PojavLauncher @rm Natives/build/libawt_headless.dylib @echo 'Finished build task - native application' diff --git a/Natives/AboutLauncherViewController.m b/Natives/AboutLauncherViewController.m index a897a810..80b28b20 100644 --- a/Natives/AboutLauncherViewController.m +++ b/Natives/AboutLauncherViewController.m @@ -5,7 +5,7 @@ #import -#ifdef NDEBUG +#if CONFIG_RELEASE == 1 # define CONFIG_TYPE "release" #else # define CONFIG_TYPE "debug" diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt index 97addf93..c47c793f 100644 --- a/Natives/CMakeLists.txt +++ b/Natives/CMakeLists.txt @@ -12,6 +12,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rpath @executable_path/Fr set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -rpath /usr/lib/jvm/java-8-openjdk/lib") add_definitions(-DCONFIG_COMMIT="${CONFIG_COMMIT}") +add_definitions(-DCONFIG_RELEASE=${CONFIG_RELEASE}) # EXT: stub library, delete after compile awt_xawt add_library(awt_headless SHARED From a3976102a910f7cd34ccca463c90bda42d901176 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Wed, 4 Aug 2021 05:48:43 +0700 Subject: [PATCH 2/2] Removed MinecraftSurface storyboard dependence --- Makefile | 1 - Natives/SurfaceViewController.m | 10 ++++--- Natives/en.lproj/MinecraftSurface.storyboard | 28 ------------------ .../MinecraftSurface.storyboardc/2-view-3.nib | Bin 1923 -> 0 bytes .../MinecraftSurface.storyboardc/Info.plist | Bin 209 -> 0 bytes .../MinecraftSurfaceVC.nib | Bin 958 -> 0 bytes Natives/ios_uikit_bridge.m | 3 +- 7 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 Natives/en.lproj/MinecraftSurface.storyboard delete mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib delete mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist delete mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib diff --git a/Makefile b/Makefile index b35c4b94..c52b34a3 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,6 @@ extras: @if [ '$(IOS)' = '0' ]; then \ mkdir -p Natives/build/PojavLauncher.app/Base.lproj; \ xcrun actool Natives/Assets.xcassets --compile Natives/resources --platform iphoneos --minimum-deployment-target 12.0 --app-icon AppIcon --output-partial-info-plist /dev/null || exit 1; \ - ibtool --compile Natives/build/PojavLauncher.app/Base.lproj/MinecraftSurface.storyboardc Natives/en.lproj/MinecraftSurface.storyboard || exit 1; \ ibtool --compile Natives/build/PojavLauncher.app/Base.lproj/LaunchScreen.storyboardc Natives/en.lproj/LaunchScreen.storyboard || exit 1; \ elif [ '$(IOS)' = '1' ]; then \ echo 'Due to the required tools not being available, you cannot compile the extras for PojavLauncher with an iOS device.'; \ diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 0aa9d91b..d974bfd1 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -77,6 +77,9 @@ int notchOffset; savedWidth = roundf(width * screenScale); savedHeight = roundf(height * screenScale); + MGLKView *surfaceView = [[MGLKView alloc] initWithFrame:self.view.frame]; + self.view = surfaceView; + touchView = [[UIView alloc] initWithFrame:self.view.frame]; notchOffset = insets.left; @@ -191,9 +194,8 @@ int notchOffset; viewController = self; - MGLKView *view = glView = (MGLKView *) self.view; - view.drawableDepthFormat = MGLDrawableDepthFormat24; - view.enableSetNeedsDisplay = YES; + surfaceView.drawableDepthFormat = MGLDrawableDepthFormat24; + surfaceView.enableSetNeedsDisplay = YES; // [self setPreferredFramesPerSecond:1000]; // Init GLES @@ -207,7 +209,7 @@ int notchOffset; NSLog(@"Failed to create ES context"); } - view.context = self.context; + surfaceView.context = self.context; #ifndef USE_EGL glContext = self.context; #endif diff --git a/Natives/en.lproj/MinecraftSurface.storyboard b/Natives/en.lproj/MinecraftSurface.storyboard deleted file mode 100644 index 0a3373b9..00000000 --- a/Natives/en.lproj/MinecraftSurface.storyboard +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib deleted file mode 100644 index 6fc6983cbe21011269262cb224f9c63d8059c3d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1923 zcmZuy%X8aA7~j?wQB>aVH)V!%XXrmbVy6w7I!?xl!;z7#t+Q0tn$;@730d5?affE-v0XK#-2fkg)N!rAo{j}Q0_x--#_fS?(4YT4jnZf4} zLW3|~hjAIkB^X;UIxv1sAoK`4_a8!Nz82M^xmGKvFVw^3puO&QHWnItVY}cZ=X&@{)cUOv{t>nR^6P&`^?&AS|F&EI1tIdI z_JHrVRo`z7`g83IzJD{XXGvj-xTIj?cZg%rS@#;Q-j&P4#UgfLhuDNy)6}_6N**&g zp^iAy%xNgDA$ZnpW{pdQD#z}+RB**9QVX*yUEN?|XRn-MpSLtJLG89js z7VXNk8D@>#XbRp&8OF|rbO@Y~&?ij7Vh-LWmW7?wtZ@~V_zBqG^k9!r>}DySWTxZV zCdWqxiBlRg-5a{Y=?Rz%d3^-C97qv7Z%V6^w35Ly*d8yuhl^a;1?nJdaLs{*<9MWj z8qC7Hp2HSUVo;A2@yaPmZ|8NO?gN6Yo<-U?q}bvxGCml@_;q-U#%z zb4!j6d15fv+tC}#0SiHU4UQ=76y;Uun%FmpBs4z#nz1S6C|mfgBP ze#gi`mMhc&TWL_u8(;_0YWcxXte%K+O!|C$M(4N;5zd$eY%fXQ zk2!{r8q?IXtrU)n*8&i|>=gHIYNC+8(w+gisl5iWrfDF3DL3Ho$`Svi#eND{QklID+ffA@4J$04X*d3pBFq>0%g_bjZogumSdv)lRx)PuH zC|)B&bqyK|`c%6Ba#v|93(7t8#*X$pyncdEYp|oKFpae5K=uI)bkV?pvUl#!M4&du zMl;t$1q%Gon*je~Qi^8PP(DY=+pt=DYgx)Kq+FD8Ne$n;2>;K}d0}`JOs^|D+6!<` zTE44Ygz3C?9^@VE6_ERypkWOi+rOhJuo9^2kQoAm$Sy{08#5@2K3t`XltYQFiIi=m z94LK7Jtn`@UIisv68DBYw=d-yN_J85P#SHb4aDNS=#agdlRC~37nzgtV(GtwYJZ{3bW0*0s zikiL%Wn7(T4YqsD__$f1ZC}Lm$b{ilDwIJ1_Zv0Z0&_ViXHv%F9=EaBi`yKEU{4S% eG4xEfz=#3g3a5m`G{(3D2W6W#X3YwGB+&ox>t$d7 diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist b/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist deleted file mode 100644 index 3c05c62b951b8f4b936088791ae45e015fa044b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmYc)$jK}&F)+By$i&RT${sJE8tNIAnOg3gpI1_ppOceXM6S{yH+73vvWl3!Grl%H6X;*wgNnVy$elA7WQ)K(dgpP5&J&=)TtjI1~eXi{c= z-bGfncmW~b%)Hd(qQtb4;L@VB#N^a4XRLw(j2!&tDOI(TmNS3>BO`=n;DFLFY9#>H CB0w(y diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib deleted file mode 100644 index f7f0f2650160d321d55f4fde40235d01cfbb1313..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmZ`%$x_=u5LFf@%4FX@gB-{g0D&r19GgPOIgh2bnUokgqcKJ|kH?z;VFMwlkgDVm zs_aDV$5Ou!Q@T+UAyKu zgYHO=RDY~=uJn%5yQ;sZ^+ffjgW>U@d!p1Q-TSQiUk2(_>u;*}UFjc6|5UwSO8-{7 zfwvUXG_BB07zdu8v_%M`z$?=_#6{q}fK)P0B}@2+z^kzOdeSPx7R1&18wh3k60-M} zud$TXV|dMYlynTeU-3O2GY(OW#%;hVUnU}}CsagU1YEKP192L7%i9tJr{@#bDUMl5 zM2$hGoY08z<~#d^WgaFGh~>?e%y9lu;8g`{;&SnYg0Hr4Aq*kKZCK1?wv_M&Yqo`z zVD`d3lz}wI{ZW?T#ufirJ(G|g+axk}=T*vtNq@BLx}Z!N4YUbmmRju-o0;7LD_2Fb z%^*7CWZ0I zJBVXK5D!TSaYWE;PM17F+#%Nyhov4dE>yNp+ZhMsq0RhnVviVKD_g6H`9|UHd5bG7 zhP2w@AP&eAOQP9kc3F*4>P8ad>lg0vx%5k#56FGnH#NgVD%T)wCEPT0EB*^+Uz&={ zIq3%8S{u!`3DvfYLC%ce>|@TnUUv3&PL8d<6lg$ajDHt|pqVBA<@Ws|CXO E3k1+Sz5oCK diff --git a/Natives/ios_uikit_bridge.m b/Natives/ios_uikit_bridge.m index f2bdf7ea..83c1f63d 100644 --- a/Natives/ios_uikit_bridge.m +++ b/Natives/ios_uikit_bridge.m @@ -149,8 +149,7 @@ void UIKit_launchJarFile(const char* filepath) { void UIKit_launchMinecraftSurfaceVC() { dispatch_async(dispatch_get_main_queue(), ^{ UIViewController *rootController = UIApplication.sharedApplication.windows.lastObject.rootViewController; - UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MinecraftSurface" bundle:nil]; - SurfaceViewController *vc = [storyboard instantiateViewControllerWithIdentifier:@"MinecraftSurfaceVC"]; + SurfaceViewController *vc = [[SurfaceViewController alloc] init]; vc.modalPresentationStyle = UIModalPresentationFullScreen; [rootController presentViewController:vc animated:YES completion:nil]; // rootController.childForScreenEdgesDeferringSystemGestures = vc;