Skip to content

Commit ca4e7f9

Browse files
moffatmanmoffatman
authored
Merge pull request #26 from moffatman/simlink
Fix compilation in Xcode 15
2 parents 18cd32f + 5b38a99 commit ca4e7f9

File tree

11 files changed

+32
-43
lines changed

11 files changed

+32
-43
lines changed

‎cross-files/iossimulator-arm64.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ strip = ['strip']
1515
pkgconfig = ['pkg-config']
1616

1717
[built-in options]
18-
c_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
19-
cpp_args = ['-stdlib=libc++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
20-
objc_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
21-
objcpp_args = ['-stdlib=libc++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
22-
c_link_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
23-
cpp_link_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
24-
objc_link_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
25-
objcpp_link_args = ['-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
18+
c_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
19+
cpp_args = ['-target', 'arm64-apple-ios-simulator', '-stdlib=libc++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
20+
objc_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
21+
objcpp_args = ['-target', 'arm64-apple-ios-simulator', '-stdlib=libc++', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
22+
c_link_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
23+
cpp_link_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
24+
objc_link_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
25+
objcpp_link_args = ['-target', 'arm64-apple-ios-simulator', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk', '-miphoneos-version-min=12.0']
2626

2727
[properties]
2828
cmake_osx_sysroot = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk'

‎patches/ltmain-target-passthrough.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/ltmain.sh
2+
+++ b/ltmain.sh
3+
@@ -7154,7 +7154,7 @@
4+
# Tru64 UNIX uses -model [arg] to determine the layout of C++
5+
# classes, name mangling, and exception handling.
6+
# Darwin uses the -arch flag to determine output architecture.
7+
- -model|-arch|-isysroot|--sysroot)
8+
+ -model|-arch|-isysroot|--sysroot|-target)
9+
func_append compiler_flags " $arg"
10+
func_append compile_command " $arg"
11+
func_append finalize_command " $arg"

‎scripts/ffmpeg/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ objc = meson.get_compiler('objc')
1111
nm = find_program('nm')
1212
ar = find_program('ar')
1313
strip = find_program('strip')
14-
pkg_config = find_program('pkgconfig')
14+
pkg_config = find_program('pkg-config')
1515

1616
# build options
1717
c_args = get_option('c_args')

‎scripts/libass/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -u # treat unset variables as an error
55

66
cd ${SRC_DIR}
77

8+
patch -p1 <${PROJECT_DIR}/patches/ltmain-target-passthrough.patch
9+
810
cp ${PROJECT_DIR}/scripts/libass/meson.build ./meson.build
911
meson setup build \
1012
--cross-file ${PROJECT_DIR}/cross-files/${OS}-${ARCH}.ini \

‎scripts/libogg/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -u # treat unset variables as an error
55

66
cd ${SRC_DIR}
77

8+
patch -p1 <${PROJECT_DIR}/patches/ltmain-target-passthrough.patch
9+
810
cp ${PROJECT_DIR}/scripts/libogg/meson.* .
911

1012
meson setup build \

‎scripts/libs-arch/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@ ${PROJECT_DIR}/scripts/libs-arch/relink-dylibs.sh ${PROJECT_DIR} @rpath ${OUTPUT
2727

2828
# remove signatures
2929
codesign --remove ${OUTPUT_DIR}/*.dylib
30-
31-
if [ "${OS}" == "iossimulator" ] && [ "${ARCH}" == "arm64" ]; then
32-
sh ${PROJECT_DIR}/scripts/libs-arch/fix-iossimulator-arm64.sh ${OUTPUT_DIR}
33-
fi

‎scripts/libs-arch/fix-iossimulator-arm64.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎scripts/libvorbis/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ set -u # treat unset variables as an error
55

66
cd ${SRC_DIR}
77

8+
patch -p1 <${PROJECT_DIR}/patches/ltmain-target-passthrough.patch
9+
10+
# Fix building on modern macOS
11+
sed -i '' 's/\-force_cpusubtype_ALL//g' configure
12+
813
cp ${PROJECT_DIR}/scripts/libvorbis/meson.* .
914

1015
meson setup build \

‎scripts/libvorbis/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ p = mod.add_project('configure',
99
'--prefix=@PREFIX@',
1010
'--disable-static',
1111
'--enable-shared',
12+
'--disable-tests'
1213
],
1314
verbose: true,
1415
)

‎scripts/libx264/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ c_args = get_option('c_args')
99
p = mod.add_project('configure',
1010
configure_options : [
1111
'--prefix=@PREFIX@',
12-
'--disable-static',
1312
'--enable-shared',
1413
'--disable-cli'
1514
],

‎scripts/libxml2/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -u # treat unset variables as an error
55

66
cd ${SRC_DIR}
77

8+
patch -p1 <${PROJECT_DIR}/patches/ltmain-target-passthrough.patch
9+
810
cp ${PROJECT_DIR}/scripts/libxml2/meson.build ./meson.build
911
meson setup build \
1012
--cross-file ${PROJECT_DIR}/cross-files/${OS}-${ARCH}.ini \

0 commit comments

Comments
 (0)