diff --git a/build-ios/build.sh b/build-ios/build.sh index 7758d80..1a78331 100755 --- a/build-ios/build.sh +++ b/build-ios/build.sh @@ -13,8 +13,6 @@ export TERM=xterm export IOS_SDK="14.2" export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo" -export IOS_GODOT_LIBS="libgodot libgodot_arkit_module libgodot_camera_module" - rm -rf godot mkdir godot cd godot @@ -36,10 +34,8 @@ if [ "${CLASSICAL}" == "1" ]; then IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" ios_triple="x86_64-apple-darwin11-" mkdir -p /root/out/templates - for lib in $IOS_GODOT_LIBS; do - $IOS_LIPO -create bin/${lib}.iphone.opt.arm64.a bin/${lib}.iphone.opt.x86_64.a -output /root/out/templates/${lib}.iphone.opt.fat - $IOS_LIPO -create bin/${lib}.iphone.opt.debug.arm64.a bin/${lib}.iphone.opt.debug.x86_64.a -output /root/out/templates/${lib}.iphone.opt.debug.fat - done + $IOS_LIPO -create bin/libgodot.iphone.opt.arm64.a bin/libgodot.iphone.opt.x86_64.a -output /root/out/templates/libgodot.iphone.opt.fat + $IOS_LIPO -create bin/libgodot.iphone.opt.debug.arm64.a bin/libgodot.iphone.opt.debug.x86_64.a -output /root/out/templates/libgodot.iphone.opt.debug.fat fi # Mono @@ -62,13 +58,10 @@ if [ "${MONO}" == "1" ]; then IPHONESDK="/root/ioscross/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk" IPHONEPATH="/root/ioscross/x86_64/" ios_triple="x86_64-apple-darwin11-" mkdir -p /root/out/templates-mono - for lib in $IOS_GODOT_LIBS; do - $IOS_LIPO -create bin/${lib}.iphone.opt.arm64.a bin/${lib}.iphone.opt.x86_64.a -output /root/out/templates-mono/${lib}.iphone.opt.fat - $IOS_LIPO -create bin/${lib}.iphone.opt.debug.arm64.a bin/${lib}.iphone.opt.debug.x86_64.a -output /root/out/templates-mono/${lib}.iphone.opt.debug.fat - done + $IOS_LIPO -create bin/libgodot.iphone.opt.arm64.a bin/libgodot.iphone.opt.x86_64.a -output /root/out/templates-mono/libgodot.iphone.opt.fat + $IOS_LIPO -create bin/libgodot.iphone.opt.debug.arm64.a bin/libgodot.iphone.opt.debug.x86_64.a -output /root/out/templates-mono/libgodot.iphone.opt.debug.fat mkdir -p /root/out/templates-mono/iphone-mono-libs - $IOS_LIPO -create bin/libmonosgen-2.0.iphone.arm64.a bin/libmonosgen-2.0.iphone.x86_64.a -output /root/out/templates-mono/iphone-mono-libs/libmonosgen-2.0.iphone.fat.a $IOS_LIPO -create bin/libmono-native.iphone.arm64.a bin/libmono-native.iphone.x86_64.a -output /root/out/templates-mono/iphone-mono-libs/libmono-native.iphone.fat.a $IOS_LIPO -create bin/libmono-profiler-log.iphone.arm64.a bin/libmono-profiler-log.iphone.x86_64.a -output /root/out/templates-mono/iphone-mono-libs/libmono-profiler-log.iphone.fat.a diff --git a/build-release.sh b/build-release.sh index 75bf5a7..343c1c2 100755 --- a/build-release.sh +++ b/build-release.sh @@ -195,11 +195,9 @@ if [ "${build_classical}" == "1" ]; then rm -rf ios_xcode cp -r git/misc/dist/ios_xcode ios_xcode - for suffix in "" "_arkit_module" "_camera_module"; do - cp out/ios/templates/libgodot${suffix}.iphone.opt.fat ios_xcode/libgodot${suffix}.iphone.release.fat.a - cp out/ios/templates/libgodot${suffix}.iphone.opt.debug.fat ios_xcode/libgodot${suffix}.iphone.debug.fat.a - done - chmod +x ios_xcode/libgodot*.iphone.* + cp out/ios/templates/libgodot.iphone.opt.fat ios_xcode/libgodot.iphone.release.fat.a + cp out/ios/templates/libgodot.iphone.opt.debug.fat ios_xcode/libgodot.iphone.debug.fat.a + chmod +x ios_xcode/libgodot.iphone.* cd ios_xcode zip -q -9 -r "${templatesdir}/iphone.zip" * cd .. @@ -404,11 +402,9 @@ if [ "${build_mono}" == "1" ]; then rm -rf ios_xcode cp -r git/misc/dist/ios_xcode ios_xcode - for suffix in "" "_arkit_module" "_camera_module"; do - cp out/ios/templates-mono/libgodot${suffix}.iphone.opt.fat ios_xcode/libgodot${suffix}.iphone.release.fat.a - cp out/ios/templates-mono/libgodot${suffix}.iphone.opt.debug.fat ios_xcode/libgodot${suffix}.iphone.debug.fat.a - done - chmod +x ios_xcode/libgodot*.iphone.* + cp out/ios/templates-mono/libgodot.iphone.opt.fat ios_xcode/libgodot.iphone.release.fat.a + cp out/ios/templates-mono/libgodot.iphone.opt.debug.fat ios_xcode/libgodot.iphone.debug.fat.a + chmod +x ios_xcode/libgodot.iphone.* cd ios_xcode zip -q -9 -r "${templatesdir_mono}/iphone.zip" * cd ..