39afe6a1dd
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/9
99 lines
3.8 KiB
Diff
99 lines
3.8 KiB
Diff
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -774,7 +774,7 @@ process_common_toolchain() {
|
|
tgt_isa=x86_64
|
|
tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
|
|
;;
|
|
- *darwin20*)
|
|
+ *darwin2[0-1]*)
|
|
tgt_isa=`uname -m`
|
|
tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'`
|
|
;;
|
|
@@ -918,9 +918,9 @@ process_common_toolchain() {
|
|
add_cflags "-mmacosx-version-min=10.15"
|
|
add_ldflags "-mmacosx-version-min=10.15"
|
|
;;
|
|
- *-darwin20-*)
|
|
- add_cflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
|
|
- add_ldflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
|
|
+ *-darwin2[0-1]-*)
|
|
+ add_cflags "-arch ${toolchain%%-*}"
|
|
+ add_ldflags "-arch ${toolchain%%-*}"
|
|
;;
|
|
*-iphonesimulator-*)
|
|
add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
|
|
--- a/build/make/gen_msvs_sln.sh
|
|
+++ b/build/make/gen_msvs_sln.sh
|
|
@@ -219,6 +219,7 @@ for opt in "$@"; do
|
|
14) vs_year=2015 ;;
|
|
15) vs_year=2017 ;;
|
|
16) vs_year=2019 ;;
|
|
+ 17) vs_year=2022 ;;
|
|
*) die Unrecognized Visual Studio Version in $opt ;;
|
|
esac
|
|
;;
|
|
@@ -232,7 +233,7 @@ done
|
|
outfile=${outfile:-/dev/stdout}
|
|
mkoutfile=${mkoutfile:-/dev/stdout}
|
|
case "${vs_ver}" in
|
|
- 1[4-6])
|
|
+ 1[4-7])
|
|
# VS has used Format Version 12.00 continuously since vs11.
|
|
sln_vers="12.00"
|
|
sln_vers_str="Visual Studio ${vs_year}"
|
|
--- a/build/make/gen_msvs_vcxproj.sh
|
|
+++ b/build/make/gen_msvs_vcxproj.sh
|
|
@@ -170,7 +170,7 @@ for opt in "$@"; do
|
|
--ver=*)
|
|
vs_ver="$optval"
|
|
case "$optval" in
|
|
- 1[4-6])
|
|
+ 1[4-7])
|
|
;;
|
|
*) die Unrecognized Visual Studio Version in $opt
|
|
;;
|
|
@@ -344,6 +344,9 @@ generate_vcxproj() {
|
|
if [ "$vs_ver" = "16" ]; then
|
|
tag_content PlatformToolset v142
|
|
fi
|
|
+ if [ "$vs_ver" = "17" ]; then
|
|
+ tag_content PlatformToolset v143
|
|
+ fi
|
|
tag_content CharacterSet Unicode
|
|
if [ "$config" = "Release" ]; then
|
|
tag_content WholeProgramOptimization true
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -100,6 +100,7 @@ EOF
|
|
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-darwin21-gcc"
|
|
all_platforms="${all_platforms} arm64-linux-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-vs15"
|
|
@@ -139,6 +140,7 @@ all_platforms="${all_platforms} x86-win32-gcc"
|
|
all_platforms="${all_platforms} x86-win32-vs14"
|
|
all_platforms="${all_platforms} x86-win32-vs15"
|
|
all_platforms="${all_platforms} x86-win32-vs16"
|
|
+all_platforms="${all_platforms} x86-win32-vs17"
|
|
all_platforms="${all_platforms} x86_64-android-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin9-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin10-gcc"
|
|
@@ -152,6 +154,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-darwin21-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"
|
|
@@ -160,6 +163,7 @@ all_platforms="${all_platforms} x86_64-win64-gcc"
|
|
all_platforms="${all_platforms} x86_64-win64-vs14"
|
|
all_platforms="${all_platforms} x86_64-win64-vs15"
|
|
all_platforms="${all_platforms} x86_64-win64-vs16"
|
|
+all_platforms="${all_platforms} x86_64-win64-vs17"
|
|
all_platforms="${all_platforms} generic-gnu"
|
|
|
|
# all_targets is a list of all targets that can be configured
|