mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-30 15:41:34 +00:00
127 lines
4.1 KiB
Diff
127 lines
4.1 KiB
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -99,6 +99,7 @@
|
|
# alphabetically by architecture, generic-gnu last.
|
|
all_platforms="${all_platforms} arm64-android-gcc"
|
|
all_platforms="${all_platforms} arm64-darwin-gcc"
|
|
+all_platforms="${all_platforms} arm64-darwin20-gcc"
|
|
all_platforms="${all_platforms} arm64-linux-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-vs15"
|
|
@@ -150,6 +151,7 @@
|
|
all_platforms="${all_platforms} x86_64-darwin17-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin18-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin19-gcc"
|
|
+all_platforms="${all_platforms} x86_64-darwin20-gcc"
|
|
all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-icc"
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -771,6 +771,10 @@
|
|
tgt_isa=x86_64
|
|
tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
|
|
;;
|
|
+ *darwin20*)
|
|
+ tgt_isa=`uname -m`
|
|
+ tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'`
|
|
+ ;;
|
|
x86_64*mingw32*)
|
|
tgt_os=win64
|
|
;;
|
|
@@ -842,86 +846,6 @@
|
|
IOS_VERSION_MIN="7.0"
|
|
fi
|
|
|
|
- # Handle darwin variants. Newer SDKs allow targeting older
|
|
- # platforms, so use the newest one available.
|
|
- case ${toolchain} in
|
|
- arm*-darwin*)
|
|
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
|
|
- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
|
|
- if [ -d "${iphoneos_sdk_dir}" ]; then
|
|
- add_cflags "-isysroot ${iphoneos_sdk_dir}"
|
|
- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
|
|
- fi
|
|
- ;;
|
|
- x86*-darwin*)
|
|
- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
|
|
- if [ -d "${osx_sdk_dir}" ]; then
|
|
- add_cflags "-isysroot ${osx_sdk_dir}"
|
|
- add_ldflags "-isysroot ${osx_sdk_dir}"
|
|
- fi
|
|
- ;;
|
|
- esac
|
|
-
|
|
- case ${toolchain} in
|
|
- *-darwin8-*)
|
|
- add_cflags "-mmacosx-version-min=10.4"
|
|
- add_ldflags "-mmacosx-version-min=10.4"
|
|
- ;;
|
|
- *-darwin9-*)
|
|
- add_cflags "-mmacosx-version-min=10.5"
|
|
- add_ldflags "-mmacosx-version-min=10.5"
|
|
- ;;
|
|
- *-darwin10-*)
|
|
- add_cflags "-mmacosx-version-min=10.6"
|
|
- add_ldflags "-mmacosx-version-min=10.6"
|
|
- ;;
|
|
- *-darwin11-*)
|
|
- add_cflags "-mmacosx-version-min=10.7"
|
|
- add_ldflags "-mmacosx-version-min=10.7"
|
|
- ;;
|
|
- *-darwin12-*)
|
|
- add_cflags "-mmacosx-version-min=10.8"
|
|
- add_ldflags "-mmacosx-version-min=10.8"
|
|
- ;;
|
|
- *-darwin13-*)
|
|
- add_cflags "-mmacosx-version-min=10.9"
|
|
- add_ldflags "-mmacosx-version-min=10.9"
|
|
- ;;
|
|
- *-darwin14-*)
|
|
- add_cflags "-mmacosx-version-min=10.10"
|
|
- add_ldflags "-mmacosx-version-min=10.10"
|
|
- ;;
|
|
- *-darwin15-*)
|
|
- add_cflags "-mmacosx-version-min=10.11"
|
|
- add_ldflags "-mmacosx-version-min=10.11"
|
|
- ;;
|
|
- *-darwin16-*)
|
|
- add_cflags "-mmacosx-version-min=10.12"
|
|
- add_ldflags "-mmacosx-version-min=10.12"
|
|
- ;;
|
|
- *-darwin17-*)
|
|
- add_cflags "-mmacosx-version-min=10.13"
|
|
- add_ldflags "-mmacosx-version-min=10.13"
|
|
- ;;
|
|
- *-darwin18-*)
|
|
- add_cflags "-mmacosx-version-min=10.14"
|
|
- add_ldflags "-mmacosx-version-min=10.14"
|
|
- ;;
|
|
- *-darwin19-*)
|
|
- add_cflags "-mmacosx-version-min=10.15"
|
|
- add_ldflags "-mmacosx-version-min=10.15"
|
|
- ;;
|
|
- *-iphonesimulator-*)
|
|
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
|
|
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
|
|
- iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
|
|
- if [ -d "${iossim_sdk_dir}" ]; then
|
|
- add_cflags "-isysroot ${iossim_sdk_dir}"
|
|
- add_ldflags "-isysroot ${iossim_sdk_dir}"
|
|
- fi
|
|
- ;;
|
|
- esac
|
|
-
|
|
# Handle Solaris variants. Solaris 10 needs -lposix4
|
|
case ${toolchain} in
|
|
sparc-solaris-*)
|
|
@@ -1084,7 +1008,7 @@
|
|
soft_enable unit_tests
|
|
;;
|
|
|
|
- darwin*)
|
|
+ darwin)
|
|
if ! enabled external_build; then
|
|
XCRUN_FIND="xcrun --sdk iphoneos --find"
|
|
CXX="$(${XCRUN_FIND} clang++)"
|