diff --git a/Makefile b/Makefile index e035790c..10cddd65 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ native: cd build; \ wget https://github.com/leetal/ios-cmake/raw/master/ios.toolchain.cmake &> /dev/null; \ cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=ios.toolchain.cmake -DDEPLOYMENT_TARGET="12.0" -DENABLE_ARC=TRUE -DENABLE_VISIBILITY=FALSE -DPLATFORM=OS64 -DENABLE_BITCODE=FALSE -DENABLE_STRICT_TRY_COMPILE=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=""; \ - cmake --build . --config Release --target pojavexec PojavLauncher; \ + cmake --build . --config Release --target pojavexec PojavLauncher || exit 1; \ cd ../..; \ elif [ '$(IOS)' = '1' ]; then \ cd Natives; \ @@ -48,26 +48,26 @@ native: input_bridge_v3.c \ utils.c \ \ - -DGLES_TESTZ -DUSE_EGLZ; \ - ldid -S../entitlements.xml PojavLauncher; \ - ldid -S../entitlements.xml libpojavexec.dylib; \ + -DGLES_TESTZ -DUSE_EGLZ || exit 1; \ + ldid -S../entitlements.xml PojavLauncher || exit 1; \ + ldid -S../entitlements.xml libpojavexec.dylib || exit 1; \ fi - @echo 'Finished build task - Native' + @echo 'Finished build task - native application' java: @echo 'Starting build task - Java application' @if [ '$(IOS)' != '1' ]; then \ cd JavaApp; \ chmod +x gradlew; \ - ./gradlew clean build; \ + ./gradlew clean build || exit 1; \ cd ..; \ elif [ '$(IOS)' = '1' ]; then \ cd JavaApp; \ shopt -s globstar; \ mkdir -p local_out/classes; \ - /usr/lib/jvm/java-16-openjdk/bin/javac -cp "libs/*" -d local_out/classes src/main/java/**/*.java; \ + /usr/lib/jvm/java-16-openjdk/bin/javac -cp "libs/*" -d local_out/classes src/main/java/**/*.java || exit 1; \ cd local_out/classes; \ - /usr/lib/jvm/java-16-openjdk/bin/jar -c -f ../launcher.jar *; \ + /usr/lib/jvm/java-16-openjdk/bin/jar -c -f ../launcher.jar * || exit 1; \ fi @echo 'Finished build task - JavaApp' @@ -75,9 +75,9 @@ extras: @echo 'Starting build task - Extras' @if [ '$(IOS)' != '1' ]; then \ mkdir -p Natives/build/Release-iphoneos/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; \ - ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/MinecraftSurface.storyboardc Natives/en.lproj/MinecraftSurface.storyboard; \ - ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/LaunchScreen.storyboardc Natives/en.lproj/LaunchScreen.storyboard; \ + 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/Release-iphoneos/PojavLauncher.app/Base.lproj/MinecraftSurface.storyboardc Natives/en.lproj/MinecraftSurface.storyboard || exit 1; \ + ibtool --compile Natives/build/Release-iphoneos/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.'; \ fi @@ -86,36 +86,37 @@ extras: package: @echo 'Starting build task - Packaging' @if [ '$(IOS)' != '1' ]; then \ - cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/; \ - cp Natives/build/Release-iphoneos/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/; \ + cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/ || exit 1; \ + cp Natives/build/Release-iphoneos/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/ || exit 1; \ mkdir Natives/build/Release-iphoneos/PojavLauncher.app/libs; \ - cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/launcher.jar; \ - cp -R JavaApp/libs/* Natives/build/Release-iphoneos/PojavLauncher.app/libs/; \ + cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/launcher.jar || exit 1; \ + cp -R JavaApp/libs/* Natives/build/Release-iphoneos/PojavLauncher.app/libs/ || exit 1; \ mkdir -p packages/pojavlauncher_iphoneos-arm/{Applications,var/mobile/Documents/minecraft,var/mobile/Documents/.pojavlauncher}; \ - sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/*; \ + sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/* || exit 1; \ cp -R Natives/build/Release-iphoneos/PojavLauncher.app packages/pojavlauncher_iphoneos-arm/Applications; \ cp -R DEBIAN packages/pojavlauncher_iphoneos-arm/DEBIAN; \ - ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app; \ - fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm; \ + ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app || exit 1; \ + fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm || exit 1; \ elif [ '$(IOS)' = '1' ]; then \ mkdir -p Natives/build; \ mkdir -p Natives/build/Release-iphoneos; \ mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app; \ mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks; \ - cp -R /Applications/PojavLauncher.app/Base.lproj Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj; \ - cp -R Natives/PojavLauncher Natives/build/Release-iphoneos/PojavLauncher.app/PojavLauncher; \ - cp -R Natives/Info.plist Natives/build/Release-iphoneos/PojavLauncher.app/Info.plist;\ - cp -R Natives/PkgInfo Natives/build/Release-iphoneos/PojavLauncher.app/PkgInfo; \ - cp -R Natives/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/libpojavexec.dylib; \ - cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/; \ - cp -R JavaApp/libs Natives/build/Release-iphoneos/PojavLauncher.app/libs; \ - cp JavaApp/local_out/launcher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/; \ + mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj; \ + cp -R Natives/en.lproj/*.storyboardc Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/ || exit 1; \ + cp -R Natives/PojavLauncher Natives/build/Release-iphoneos/PojavLauncher.app/PojavLauncher || exit 1; \ + cp -R Natives/Info.plist Natives/build/Release-iphoneos/PojavLauncher.app/Info.plist || exit 1;\ + cp -R Natives/PkgInfo Natives/build/Release-iphoneos/PojavLauncher.app/PkgInfo || exit 1; \ + cp -R Natives/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/libpojavexec.dylib || exit 1; \ + cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/ || exit 1; \ + cp -R JavaApp/libs Natives/build/Release-iphoneos/PojavLauncher.app/libs || exit 1; \ + cp JavaApp/local_out/launcher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/ || exit 1; \ mkdir -p packages/pojavlauncher_iphoneos-arm/{Applications,var/mobile/Documents/minecraft,var/mobile/Documents/.pojavlauncher}; \ sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/*; \ cp -R Natives/build/Release-iphoneos/PojavLauncher.app packages/pojavlauncher_iphoneos-arm/Applications; \ cp -R DEBIAN packages/pojavlauncher_iphoneos-arm/DEBIAN; \ - ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app; \ - fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm; \ + ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app || exit 1; \ + fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm || exit 1; \ fi @echo 'Finished build task - Packaging' diff --git a/Natives/en.lproj/InfoPlist.strings b/Natives/en.lproj/InfoPlist.strings index b92732c7..a7361add 100644 --- a/Natives/en.lproj/InfoPlist.strings +++ b/Natives/en.lproj/InfoPlist.strings @@ -1 +1 @@ -/* Localized versions of Info.plist keys */ +/* Localized versions of Info.plist keys */ \ No newline at end of file diff --git a/Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib new file mode 100644 index 00000000..b3414d97 Binary files /dev/null and b/Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/Natives/en.lproj/LaunchScreen.storyboardc/Info.plist b/Natives/en.lproj/LaunchScreen.storyboardc/Info.plist new file mode 100644 index 00000000..32288e88 Binary files /dev/null and b/Natives/en.lproj/LaunchScreen.storyboardc/Info.plist differ diff --git a/Natives/en.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/Natives/en.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib new file mode 100644 index 00000000..1010fe20 Binary files /dev/null and b/Natives/en.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib new file mode 100644 index 00000000..6fc6983c Binary files /dev/null and b/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib differ diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist b/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist new file mode 100644 index 00000000..3c05c62b Binary files /dev/null and b/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist differ diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib new file mode 100644 index 00000000..f7f0f265 Binary files /dev/null and b/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib differ