ref: 5fddd6397390d34b874e2f72249cbc5f84fc06d6
parent: 67c999876e9ae1a0f927c09ef2c64fc8b638eec1
parent: 539dc7649f67ec10097b3c8eb2c0073f0d0571ce
author: Johann Koenig <[email protected]>
date: Wed Dec 5 18:40:57 EST 2018
Merge "remove old visual studio support"
--- a/README
+++ b/README
@@ -69,8 +69,6 @@
armv7-linux-rvct
armv7-linux-gcc
armv7-none-rvct
- armv7-win32-vs11
- armv7-win32-vs12
armv7-win32-vs14
armv7-win32-vs15
armv7s-darwin-gcc
@@ -97,9 +95,6 @@
x86-os2-gcc
x86-solaris-gcc
x86-win32-gcc
- x86-win32-vs10
- x86-win32-vs11
- x86-win32-vs12
x86-win32-vs14
x86-win32-vs15
x86_64-android-gcc
@@ -116,9 +111,6 @@
x86_64-linux-icc
x86_64-solaris-gcc
x86_64-win64-gcc
- x86_64-win64-vs10
- x86_64-win64-vs11
- x86_64-win64-vs12
x86_64-win64-vs14
x86_64-win64-vs15
generic-gnu
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1037,8 +1037,7 @@
msvs_arch_dir=arm-msvs
disable_feature multithread
disable_feature unit_tests
- vs_version=${tgt_cc##vs}- if [ $vs_version -ge 12 ]; then
+ if [ ${tgt_cc##vs} -ge 12 ]; then# MSVC 2013 doesn't allow doing plain .exe projects for ARM32,
# only "AppContainerApplication" which requires an AppxManifest.
# Therefore disable the examples, just build the library.
@@ -1353,26 +1352,11 @@
# Skip the check by setting AS arbitrarily
AS=msvs
msvs_arch_dir=x86-msvs
- vc_version=${tgt_cc##vs}- case $vc_version in
- 7|8|9|10|11|12|13|14)
+ case ${tgt_cc##vs} in+ 14)
echo "${tgt_cc} does not support avx512, disabling....." RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 "soft_disable avx512
- ;;
- esac
- case $vc_version in
- 7|8|9|10)
- echo "${tgt_cc} does not support avx/avx2, disabling....."- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx --disable-avx2 "- soft_disable avx
- soft_disable avx2
- ;;
- esac
- case $vc_version in
- 7|8|9)
- echo "${tgt_cc} omits stdint.h, disabling webm-io..."- soft_disable webm_io
;;
esac
;;
--- a/configure
+++ b/configure
@@ -109,8 +109,6 @@
all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-win32-gcc"-all_platforms="${all_platforms} armv7-win32-vs11"-all_platforms="${all_platforms} armv7-win32-vs12" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" all_platforms="${all_platforms} armv7s-darwin-gcc"@@ -138,9 +136,6 @@
all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" all_platforms="${all_platforms} x86-win32-gcc"-all_platforms="${all_platforms} x86-win32-vs10"-all_platforms="${all_platforms} x86-win32-vs11"-all_platforms="${all_platforms} x86-win32-vs12" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" all_platforms="${all_platforms} x86_64-android-gcc"@@ -158,9 +153,6 @@
all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" all_platforms="${all_platforms} x86_64-win64-gcc"-all_platforms="${all_platforms} x86_64-win64-vs10"-all_platforms="${all_platforms} x86_64-win64-vs11"-all_platforms="${all_platforms} x86_64-win64-vs12" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" all_platforms="${all_platforms} generic-gnu"