diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-22 12:10:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-22 12:10:14 +0100 |
| commit | 656f81eec729b48138354a9fa2d72076d448182a (patch) | |
| tree | 21b05ca7f82858e486a7f2afa8afa2e6eb9d87da /platform/iphone | |
| parent | 489f11ee0cbbb90f4f629aa7fd846078148aaa8e (diff) | |
| parent | cd6ac96bbb02b75875bf85e648e24588de3b5a1f (diff) | |
Merge pull request #55793 from aaronfranke/ios64
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/detect.py | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 0d28aa2f06..4e4b0d81c3 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -62,16 +62,9 @@ def configure(env): env.Append(LINKFLAGS=["-flto"]) ## Architecture - if env["arch"] == "x86": # i386 - env["bits"] = "32" - elif env["arch"] == "x86_64": - env["bits"] = "64" - elif env["arch"] == "arm" or env["arch"] == "arm32" or env["arch"] == "armv7" or env["bits"] == "32": # arm - env["arch"] = "arm" - env["bits"] = "32" - else: # armv64 + env["bits"] = "64" + if env["arch"] != "x86_64": env["arch"] = "arm64" - env["bits"] = "64" ## Compiler configuration @@ -108,28 +101,15 @@ def configure(env): detect_darwin_sdk_path("iphone", env) env.Append(CCFLAGS=["-miphoneos-version-min=11.0"]) - if env["arch"] == "x86" or env["arch"] == "x86_64": + if env["arch"] == "x86_64": env["ENV"]["MACOSX_DEPLOYMENT_TARGET"] = "10.9" - arch_flag = "i386" if env["arch"] == "x86" else env["arch"] env.Append( CCFLAGS=( - "-fobjc-arc -arch " - + arch_flag - + " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks" + "-fobjc-arc -arch x86_64" + " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks" " -fasm-blocks -isysroot $IPHONESDK" ).split() ) - elif env["arch"] == "arm": - env.Append( - CCFLAGS=( - "-fobjc-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)" -MMD -MT dependencies'.split() - ) - ) elif env["arch"] == "arm64": env.Append( CCFLAGS=( |