Commit 56bf1a95 authored by James Zern's avatar James Zern
Browse files

configure: drop support for Visual Studio < 2013

this is a precursor to requiring toolchains to support c99

BUG=aomedia:111

Change-Id: Ic501ea074e738fe7870ce3f56fb6e87a509632fd
parent f12d4b0c
...@@ -56,7 +56,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -56,7 +56,6 @@ COMPILING THE APPLICATIONS/LIBRARIES:
armv7-linux-rvct armv7-linux-rvct
armv7-linux-gcc armv7-linux-gcc
armv7-none-rvct armv7-none-rvct
armv7-win32-vs11
armv7-win32-vs12 armv7-win32-vs12
armv7-win32-vs14 armv7-win32-vs14
armv7s-darwin-gcc armv7s-darwin-gcc
...@@ -79,8 +78,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -79,8 +78,6 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86-os2-gcc x86-os2-gcc
x86-solaris-gcc x86-solaris-gcc
x86-win32-gcc x86-win32-gcc
x86-win32-vs10
x86-win32-vs11
x86-win32-vs12 x86-win32-vs12
x86-win32-vs14 x86-win32-vs14
x86_64-android-gcc x86_64-android-gcc
...@@ -95,8 +92,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -95,8 +92,6 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86_64-linux-icc x86_64-linux-icc
x86_64-solaris-gcc x86_64-solaris-gcc
x86_64-win64-gcc x86_64-win64-gcc
x86_64-win64-vs10
x86_64-win64-vs11
x86_64-win64-vs12 x86_64-win64-vs12
x86_64-win64-vs14 x86_64-win64-vs14
generic-gnu generic-gnu
......
...@@ -964,12 +964,10 @@ EOF ...@@ -964,12 +964,10 @@ EOF
disable_feature multithread disable_feature multithread
disable_feature unit_tests disable_feature unit_tests
vs_version=${tgt_cc##vs} vs_version=${tgt_cc##vs}
if [ $vs_version -ge 12 ]; then
# MSVC 2013 doesn't allow doing plain .exe projects for ARM, # MSVC 2013 doesn't allow doing plain .exe projects for ARM,
# only "AppContainerApplication" which requires an AppxManifest. # only "AppContainerApplication" which requires an AppxManifest.
# Therefore disable the examples, just build the library. # Therefore disable the examples, just build the library.
disable_feature examples disable_feature examples
fi
;; ;;
rvct) rvct)
CC=armcc CC=armcc
...@@ -1231,20 +1229,6 @@ EOF ...@@ -1231,20 +1229,6 @@ EOF
AS=msvs AS=msvs
msvs_arch_dir=x86-msvs msvs_arch_dir=x86-msvs
vc_version=${tgt_cc##vs} vc_version=${tgt_cc##vs}
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
;; ;;
esac esac
......
...@@ -25,7 +25,7 @@ files. ...@@ -25,7 +25,7 @@ files.
Options: Options:
--help Print this message --help Print this message
--out=outfile Redirect output to a file --out=outfile Redirect output to a file
--ver=version Version (7,8,9,10,11,12,14) of visual studio to generate for --ver=version Version (12,14) of visual studio to generate for
--target=isa-os-cc Target specifier --target=isa-os-cc Target specifier
EOF EOF
exit 1 exit 1
...@@ -171,7 +171,7 @@ ${TAB}@echo " * You will have to build all configurations manually using the" ...@@ -171,7 +171,7 @@ ${TAB}@echo " * You will have to build all configurations manually using the"
${TAB}@echo " * Visual Studio IDE. To allow make to build them automatically," ${TAB}@echo " * Visual Studio IDE. To allow make to build them automatically,"
${TAB}@echo " * add the Common7/IDE directory of your Visual Studio" ${TAB}@echo " * add the Common7/IDE directory of your Visual Studio"
${TAB}@echo " * installation to your path, eg:" ${TAB}@echo " * installation to your path, eg:"
${TAB}@echo " * C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE" ${TAB}@echo " * C:\Program Files\Microsoft Visual Studio 12.0\Common7\IDE"
${TAB}@echo " * " ${TAB}@echo " * "
${TAB}@touch \$@ ${TAB}@touch \$@
CLEAN-OBJS += \$(if \$(found_devenv),,.nodevenv.once) CLEAN-OBJS += \$(if \$(found_devenv),,.nodevenv.once)
...@@ -215,7 +215,7 @@ for opt in "$@"; do ...@@ -215,7 +215,7 @@ for opt in "$@"; do
;; ;;
--ver=*) vs_ver="$optval" --ver=*) vs_ver="$optval"
case $optval in case $optval in
10|11|12|14) 12|14)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -230,13 +230,7 @@ for opt in "$@"; do ...@@ -230,13 +230,7 @@ for opt in "$@"; do
done done
outfile=${outfile:-/dev/stdout} outfile=${outfile:-/dev/stdout}
mkoutfile=${mkoutfile:-/dev/stdout} mkoutfile=${mkoutfile:-/dev/stdout}
case "${vs_ver:-10}" in case "${vs_ver:-12}" in
10) sln_vers="11.00"
sln_vers_str="Visual Studio 2010"
;;
11) sln_vers="12.00"
sln_vers_str="Visual Studio 2012"
;;
12) sln_vers="12.00" 12) sln_vers="12.00"
sln_vers_str="Visual Studio 2013" sln_vers_str="Visual Studio 2013"
;; ;;
......
...@@ -34,7 +34,7 @@ Options: ...@@ -34,7 +34,7 @@ Options:
--name=project_name Name of the project (required) --name=project_name Name of the project (required)
--proj-guid=GUID GUID to use for the project --proj-guid=GUID GUID to use for the project
--module-def=filename File containing export definitions (for DLLs) --module-def=filename File containing export definitions (for DLLs)
--ver=version Version (10,11,12,14) of visual studio to generate for --ver=version Version (12,14) of visual studio to generate for
--src-path-bare=dir Path to root of source tree --src-path-bare=dir Path to root of source tree
-Ipath/to/include Additional include directories -Ipath/to/include Additional include directories
-DFLAG[=value] Preprocessor macros to define -DFLAG[=value] Preprocessor macros to define
...@@ -168,7 +168,7 @@ for opt in "$@"; do ...@@ -168,7 +168,7 @@ for opt in "$@"; do
--ver=*) --ver=*)
vs_ver="$optval" vs_ver="$optval"
case "$optval" in case "$optval" in
10|11|12|14) 12|14)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -217,8 +217,8 @@ outfile=${outfile:-/dev/stdout} ...@@ -217,8 +217,8 @@ outfile=${outfile:-/dev/stdout}
guid=${guid:-`generate_uuid`} guid=${guid:-`generate_uuid`}
asm_use_custom_step=false asm_use_custom_step=false
uses_asm=${uses_asm:-false} uses_asm=${uses_asm:-false}
case "${vs_ver:-11}" in case "${vs_ver:-12}" in
10|11|12|14) 12|14)
asm_use_custom_step=$uses_asm asm_use_custom_step=$uses_asm
;; ;;
esac esac
...@@ -295,7 +295,7 @@ generate_vcxproj() { ...@@ -295,7 +295,7 @@ generate_vcxproj() {
tag_content ProjectGuid "{${guid}}" tag_content ProjectGuid "{${guid}}"
tag_content RootNamespace ${name} tag_content RootNamespace ${name}
tag_content Keyword ManagedCProj tag_content Keyword ManagedCProj
if [ $vs_ver -ge 12 ] && [ "${platforms[0]}" = "ARM" ]; then if [ "${platforms[0]}" = "ARM" ]; then
tag_content AppContainerApplication true tag_content AppContainerApplication true
# The application type can be one of "Windows Store", # The application type can be one of "Windows Store",
# "Windows Phone" or "Windows Phone Silverlight". The # "Windows Phone" or "Windows Phone Silverlight". The
...@@ -324,20 +324,6 @@ generate_vcxproj() { ...@@ -324,20 +324,6 @@ generate_vcxproj() {
else else
tag_content ConfigurationType StaticLibrary tag_content ConfigurationType StaticLibrary
fi fi
if [ "$vs_ver" = "11" ]; then
if [ "$plat" = "ARM" ]; then
# Setting the wp80 toolchain automatically sets the
# WINAPI_FAMILY define, which is required for building
# code for arm with the windows headers. Alternatively,
# one could add AppContainerApplication=true in the Globals
# section and add PrecompiledHeader=NotUsing and
# CompileAsWinRT=false in ClCompile and SubSystem=Console
# in Link.
tag_content PlatformToolset v110_wp80
else
tag_content PlatformToolset v110
fi
fi
if [ "$vs_ver" = "12" ]; then if [ "$vs_ver" = "12" ]; then
# Setting a PlatformToolset indicating windows phone isn't # Setting a PlatformToolset indicating windows phone isn't
# enough to build code for arm with MSVC 2013, one strictly # enough to build code for arm with MSVC 2013, one strictly
...@@ -420,13 +406,11 @@ generate_vcxproj() { ...@@ -420,13 +406,11 @@ generate_vcxproj() {
if ${werror:-false}; then if ${werror:-false}; then
tag_content TreatWarningAsError true tag_content TreatWarningAsError true
fi fi
if [ $vs_ver -ge 11 ]; then
# We need to override the defaults for these settings # We need to override the defaults for these settings
# if AppContainerApplication is set. # if AppContainerApplication is set.
tag_content CompileAsWinRT false tag_content CompileAsWinRT false
tag_content PrecompiledHeader NotUsing tag_content PrecompiledHeader NotUsing
tag_content SDLCheck false tag_content SDLCheck false
fi
close_tag ClCompile close_tag ClCompile
case "$proj_kind" in case "$proj_kind" in
exe) exe)
......
...@@ -107,7 +107,6 @@ all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 ...@@ -107,7 +107,6 @@ all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 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-none-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-win32-vs11"
all_platforms="${all_platforms} armv7-win32-vs12" all_platforms="${all_platforms} armv7-win32-vs12"
all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs14"
all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv7s-darwin-gcc"
...@@ -132,8 +131,6 @@ all_platforms="${all_platforms} x86-linux-icc" ...@@ -132,8 +131,6 @@ all_platforms="${all_platforms} x86-linux-icc"
all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-os2-gcc"
all_platforms="${all_platforms} x86-solaris-gcc" all_platforms="${all_platforms} x86-solaris-gcc"
all_platforms="${all_platforms} x86-win32-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-vs12"
all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs14"
all_platforms="${all_platforms} x86_64-android-gcc" all_platforms="${all_platforms} x86_64-android-gcc"
...@@ -149,8 +146,6 @@ all_platforms="${all_platforms} x86_64-linux-gcc" ...@@ -149,8 +146,6 @@ all_platforms="${all_platforms} x86_64-linux-gcc"
all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-linux-icc"
all_platforms="${all_platforms} x86_64-solaris-gcc" all_platforms="${all_platforms} x86_64-solaris-gcc"
all_platforms="${all_platforms} x86_64-win64-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-vs12"
all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs14"
all_platforms="${all_platforms} generic-gnu" all_platforms="${all_platforms} generic-gnu"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment