PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Makefile and provide already-compiled versions of the storyboards.

Browse Source 
The removes the requirement of having PojavLauncher already installed.
This commit is contained in:
Adam Tunnic committed 2021-06-13 03:24:26 +07:00
1 parent e8539ad537
commit 0bed0f6932
8 files changed
+30 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+29 -28
View File
@@ -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'
Natives/en.lproj/InfoPlist.strings
+1 -1
View File
@@ -1 +1 @@
/* Localized versions of Info.plist keys */
/* Localized versions of Info.plist keys */
Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
Generated
BIN
View File
Binary file not shown.
Natives/en.lproj/LaunchScreen.storyboardc/Info.plist
BIN
View File
Binary file not shown.
Natives/en.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
Generated
BIN
View File
Binary file not shown.
Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib
Generated
BIN
View File
Binary file not shown.
Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist
BIN
View File
Binary file not shown.
Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib
Generated
BIN
View File
Binary file not shown.