Skip to content

Commit

Permalink
use macOS 14 and remove bitcode support
Browse files Browse the repository at this point in the history
  • Loading branch information
debugly committed Nov 15, 2024
1 parent 6d3802b commit 4314899
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create all library Release
jobs:
build:
name: compile all lib then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create ass Release
jobs:
build:
name: compile ass then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bluray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create bluray Release
jobs:
build:
name: compile bluray then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dav1d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create dav1d Release
jobs:
build:
name: compile dav1d then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dvdread.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create dvdread Release
jobs:
build:
name: compile dvdread then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create ffmpeg Release
jobs:
build:
name: compile ffmpeg then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/freetype.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create freetype Release
jobs:
build:
name: compile freetype then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fribidi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create fribidi Release
jobs:
build:
name: compile fribidi then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/harfbuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create harfbuzz Release
jobs:
build:
name: compile harfbuzz then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create openssl Release
jobs:
build:
name: compile openssl then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/opus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create opus Release
jobs:
build:
name: compile opus then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smb2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create smb2 Release
jobs:
build:
name: compile smb2 then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Test Release
jobs:
build:
name: compile none then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/uavsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create uavs3d Release
jobs:
build:
name: compile uavs3d then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unibreak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Create unibreak Release
jobs:
build:
name: compile unibreak then deploy
runs-on: macos-13
runs-on: macos-14
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,9 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、fr
| macOS | arm64、x86_64 |
| tvOS | arm64、arm64_simulator、x86_64_simulator |

## Deprecations
## News

**MRFFToolChain will remove bitcode support about 2025.01.01**

Starting with Xcode 14, bitcode is no longer required for watchOS and tvOS applications, and the App Store no longer accepts bitcode submissions from Xcode 14.

Xcode no longer builds bitcode by default and generates a warning message if a project explicitly enables bitcode: “Building with bitcode is deprecated. Please update your project and/or target settings to disable bitcode.” The capability to build with bitcode will be removed in a future Xcode release. IPAs that contain bitcode will have the bitcode stripped before being submitted to the App Store. Debug symbols can only be downloaded from App Store Connect / TestFlight for existing bitcode submissions and are no longer available for submissions made with Xcode 14. (86118779)
- using macOS 14, remove bitcode support

[https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes#Deprecations](https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes#Deprecations)

Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/arm64-ios-simulator.meson
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
c_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
c_link_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_link_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objc_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objcpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objc_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objcpp_args = ['-arch', 'arm64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer'
Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/arm64-ios.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
cpp_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
c_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
cpp_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
c_link_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
cpp_link_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
objc_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
objcpp_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
objc_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
objcpp_args = ['-arch', 'arm64', '-miphoneos-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'
Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/arm64-tvos-simulator.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
c_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
c_link_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_link_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objc_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objcpp_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objc_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objcpp_args = ['-arch', 'arm64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer'
Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/arm64-tvos.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
cpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
c_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
cpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
c_link_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
cpp_link_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
objc_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
objcpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
objc_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
objcpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer'
Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/x86_64-ios-simulator.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
c_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
c_link_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
cpp_link_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objc_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objcpp_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objc_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']
objcpp_args = ['-arch', 'x86_64', '-mios-simulator-version-min=9.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer'
Expand Down
8 changes: 4 additions & 4 deletions configs/meson-crossfiles/x86_64-tvos-simulator.meson
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ar = 'ar'
strip = 'strip'

[built-in options]
c_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
c_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
c_link_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
cpp_link_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objc_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objcpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-fembed-bitcode', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objc_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']
objcpp_args = ['-arch', 'x86_64', '-mtvos-simulator-version-min=12.0', '-Os', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk']

[properties]
root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer'
Expand Down
2 changes: 1 addition & 1 deletion do-compile/uavs3d.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ elif [[ "$XC_PLAT" == 'macos' ]];then
fi
fi

cmake -S ${XC_BUILD_SOURCE} -DCMAKE_INSTALL_PREFIX=${XC_BUILD_PREFIX} -GXcode -DBUILD_SHARED_LIBS=0 -DENABLE_BITCODE=1 -DCMAKE_TOOLCHAIN_FILE=$toolchain -DCOMPILE_10BIT=1 -DPLATFORM=$pf
cmake -S ${XC_BUILD_SOURCE} -DCMAKE_INSTALL_PREFIX=${XC_BUILD_PREFIX} -GXcode -DBUILD_SHARED_LIBS=0 -DCMAKE_TOOLCHAIN_FILE=$toolchain -DCOMPILE_10BIT=1 -DPLATFORM=$pf

echo "----------------------"
echo "[*] compile $LIB_NAME"
Expand Down
6 changes: 2 additions & 4 deletions tools/export-plat-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@ function init_plat_env() {
fi
#on intel compile arm64 harfbuzz can't find pkg-config
export PKG_CONFIG=$(which pkg-config)

export XC_OTHER_CFLAGS=""

if [[ "$XC_PLAT" == 'ios' ]]; then
export XC_OTHER_CFLAGS="-fembed-bitcode"
ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
elif [[ "$XC_PLAT" == 'macos' ]]; then
export XC_OTHER_CFLAGS=""
ALL_ARCHS="x86_64 arm64"
elif [[ "$XC_PLAT" == 'tvos' ]]; then
export XC_OTHER_CFLAGS="-fembed-bitcode"
ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
fi

Expand Down
Loading

0 comments on commit 4314899

Please sign in to comment.