diff --git a/Dockerfile.ios b/Dockerfile.ios index 22c653b..080ce39 100644 --- a/Dockerfile.ios +++ b/Dockerfile.ios @@ -3,7 +3,7 @@ FROM godot-osx:${img_version} ARG mono_version -ENV IOS_SDK=14.4 +ENV IOS_SDK=15.4 RUN dnf -y install --setopt=install_weak_deps=False \ automake autoconf clang gcc gcc-c++ gcc-objc gcc-objc++ cmake libicu-devel libtool libxml2-devel llvm-devel openssl-devel perl python yasm && \ diff --git a/Dockerfile.osx b/Dockerfile.osx index 6609c4e..027419a 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -9,7 +9,8 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand git clone --progress https://github.com/tpoechtrager/osxcross.git && \ cd /root/osxcross && \ git checkout 610542781e0eabc6968b0c0719bbc8d25c992025 && \ - ln -s /root/files/MacOSX11.1.sdk.tar.xz /root/osxcross/tarballs && \ + ln -s /root/files/MacOSX12.3.sdk.tar.xz /root/osxcross/tarballs && \ + sed -i build.sh -e "/ 12.1\*/a 12.3*) TARGET=darwin21.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;" && \ sed -i build_compiler_rt.sh -e "s@BRANCH=main@BRANCH=release/14.x@g" && \ UNATTENDED=1 ./build.sh && \ ./build_compiler_rt.sh @@ -21,7 +22,7 @@ RUN cp -a /root/files/${mono_version} /root && \ cd /root/${mono_version} && \ patch -p1 < /root/files/patches/mono-btls-cmake-wrapper.patch && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \ - export OSXCROSS_SDK=20.2 && \ + export OSXCROSS_SDK=21.4 && \ cd /root/${mono_version}/godot-mono-builds && \ python3 osx.py configure -j --target=x86_64 --target=arm64 && \ python3 osx.py make -j --target=x86_64 --target=arm64 && \ diff --git a/Dockerfile.xcode b/Dockerfile.xcode index e7675ef..75f9027 100644 --- a/Dockerfile.xcode +++ b/Dockerfile.xcode @@ -8,11 +8,15 @@ RUN dnf -y install --setopt=install_weak_deps=False \ git checkout 2a4d7c3300c826d918def713a24d25c237c8ed53 && \ clang -O3 -llzma -lxar -I /usr/local/include pbzx.c -o pbzx +ENV XCODE_SDKV= +ENV OSX_SDKV= +ENV IOS_SDKV= + CMD mkdir -p /root/xcode && \ cd /root/xcode && \ - xar -xf /root/files/Xcode_12.4.xip && \ + xar -xf /root/files/Xcode_${XCODE_SDKV}.xip && \ /root/pbzx/pbzx -n Content | cpio -i && \ - export OSX_SDK=MacOSX11.1.sdk && \ + export OSX_SDK=MacOSX${OSX_SDKV}.sdk && \ cp -r Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /tmp/${OSX_SDK} && \ mkdir -p /tmp/${OSX_SDK}/usr/include/c++ && \ cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/${OSX_SDK}/usr/include/c++/ && \ @@ -24,8 +28,8 @@ CMD mkdir -p /root/xcode && \ tar -cJf /root/files/${OSX_SDK}.tar.xz ${OSX_SDK} && \ rm -rf ${OSX_SDK} && \ cd /root/xcode && \ - export IOS_SDK=iPhoneOS14.4.sdk && \ - export IOS_SIMULATOR_SDK=iPhoneSimulator14.4.sdk && \ + export IOS_SDK=iPhoneOS${IOS_SDKV}.sdk && \ + export IOS_SIMULATOR_SDK=iPhoneSimulator${IOS_SDKV}.sdk && \ cp -r Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk /tmp/${IOS_SDK} && \ mkdir -p /tmp/${IOS_SDK}/usr/include/c++ && \ cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/${IOS_SDK}/usr/include/c++/ && \ diff --git a/build.sh b/build.sh index 7b75f09..adda0c3 100755 --- a/build.sh +++ b/build.sh @@ -110,9 +110,9 @@ $podman_build_mono -t godot-windows:${img_version} -f Dockerfile.windows . 2>&1 $podman_build_mono -t godot-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log $podman_build_mono -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log -XCODE_SDK=12.4 -OSX_SDK=11.1 -IOS_SDK=14.4 +XCODE_SDK=13.3.1 +OSX_SDK=12.3 +IOS_SDK=15.4 if [ ! -e files/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneOS${IOS_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz ]; then if [ ! -e files/Xcode_${XCODE_SDK}.xip ]; then echo "files/Xcode_${XCODE_SDK}.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID." @@ -121,7 +121,7 @@ if [ ! -e files/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneOS${IOS_SDK} echo "Building OSX and iOS SDK packages. This will take a while" $podman_build -t godot-xcode-packer:${img_version} -f Dockerfile.xcode -v ${files_root}:/root/files . 2>&1 | tee logs/xcode.log - $podman run -it --rm -v ${files_root}:/root/files godot-xcode-packer:${img_version} 2>&1 | tee logs/xcode_packer.log + $podman run -it --rm -v ${files_root}:/root/files -e XCODE_SDKV="${XCODE_SDK}" -e OSX_SDKV="${OSX_SDK}" -e IOS_SDKV="${IOS_SDK}" godot-xcode-packer:${img_version} 2>&1 | tee logs/xcode_packer.log fi $podman_build_mono -t godot-osx:${img_version} -f Dockerfile.osx . 2>&1 | tee logs/osx.log