|
@@ -120,18 +120,18 @@ def configure(env):
|
|
CCFLAGS=(
|
|
CCFLAGS=(
|
|
"-arch "
|
|
"-arch "
|
|
+ arch_flag
|
|
+ arch_flag
|
|
- + " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks -fasm-blocks -isysroot $IPHONESDK -mios-simulator-version-min=10.0"
|
|
|
|
|
|
+ + " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks -fasm-blocks -isysroot $IPHONESDK -mios-simulator-version-min=13.0"
|
|
).split()
|
|
).split()
|
|
)
|
|
)
|
|
elif env["arch"] == "arm":
|
|
elif env["arch"] == "arm":
|
|
detect_darwin_sdk_path("iphone", env)
|
|
detect_darwin_sdk_path("iphone", env)
|
|
env.Append(
|
|
env.Append(
|
|
- CCFLAGS='-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -isysroot $IPHONESDK -fvisibility=hidden -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=10.0 -MMD -MT dependencies'.split()
|
|
|
|
|
|
+ CCFLAGS='-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -isysroot $IPHONESDK -fvisibility=hidden -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=11.0 -MMD -MT dependencies'.split()
|
|
)
|
|
)
|
|
elif env["arch"] == "arm64":
|
|
elif env["arch"] == "arm64":
|
|
detect_darwin_sdk_path("iphone", env)
|
|
detect_darwin_sdk_path("iphone", env)
|
|
env.Append(
|
|
env.Append(
|
|
- CCFLAGS="-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -fvisibility=hidden -MMD -MT dependencies -miphoneos-version-min=10.0 -isysroot $IPHONESDK".split()
|
|
|
|
|
|
+ CCFLAGS="-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -fvisibility=hidden -MMD -MT dependencies -miphoneos-version-min=11.0 -isysroot $IPHONESDK".split()
|
|
)
|
|
)
|
|
env.Append(CPPDEFINES=["NEED_LONG_INT"])
|
|
env.Append(CPPDEFINES=["NEED_LONG_INT"])
|
|
env.Append(CPPDEFINES=["LIBYUV_DISABLE_NEON"])
|
|
env.Append(CPPDEFINES=["LIBYUV_DISABLE_NEON"])
|
|
@@ -151,7 +151,7 @@ def configure(env):
|
|
LINKFLAGS=[
|
|
LINKFLAGS=[
|
|
"-arch",
|
|
"-arch",
|
|
arch_flag,
|
|
arch_flag,
|
|
- "-mios-simulator-version-min=10.0",
|
|
|
|
|
|
+ "-mios-simulator-version-min=13.0",
|
|
"-isysroot",
|
|
"-isysroot",
|
|
"$IPHONESDK",
|
|
"$IPHONESDK",
|
|
"-Xlinker",
|
|
"-Xlinker",
|
|
@@ -162,9 +162,9 @@ def configure(env):
|
|
]
|
|
]
|
|
)
|
|
)
|
|
elif env["arch"] == "arm":
|
|
elif env["arch"] == "arm":
|
|
- env.Append(LINKFLAGS=["-arch", "armv7", "-Wl,-dead_strip", "-miphoneos-version-min=10.0"])
|
|
|
|
|
|
+ env.Append(LINKFLAGS=["-arch", "armv7", "-Wl,-dead_strip", "-miphoneos-version-min=11.0"])
|
|
if env["arch"] == "arm64":
|
|
if env["arch"] == "arm64":
|
|
- env.Append(LINKFLAGS=["-arch", "arm64", "-Wl,-dead_strip", "-miphoneos-version-min=10.0"])
|
|
|
|
|
|
+ env.Append(LINKFLAGS=["-arch", "arm64", "-Wl,-dead_strip", "-miphoneos-version-min=11.0"])
|
|
|
|
|
|
env.Append(
|
|
env.Append(
|
|
LINKFLAGS=[
|
|
LINKFLAGS=[
|