diff --git a/README b/README index 29072b919..460ad7390 100644 --- a/README +++ b/README @@ -79,9 +79,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: x86-os2-gcc x86-solaris-gcc x86-win32-gcc - x86-win32-vs7 - x86-win32-vs8 - x86-win32-vs9 x86-win32-vs10 x86-win32-vs11 x86-win32-vs12 @@ -98,8 +95,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: x86_64-linux-icc x86_64-solaris-gcc x86_64-win64-gcc - x86_64-win64-vs8 - x86_64-win64-vs9 x86_64-win64-vs10 x86_64-win64-vs11 x86_64-win64-vs12 diff --git a/build/make/Makefile b/build/make/Makefile index 3e8c02490..dfb7e4b7a 100644 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -418,7 +418,6 @@ ifneq ($(call enabled,DIST-SRCS),) DIST-SRCS-yes += build/make/gen_asm_deps.sh DIST-SRCS-yes += build/make/Makefile DIST-SRCS-$(CONFIG_MSVS) += build/make/gen_msvs_def.sh - DIST-SRCS-$(CONFIG_MSVS) += build/make/gen_msvs_proj.sh DIST-SRCS-$(CONFIG_MSVS) += build/make/gen_msvs_sln.sh DIST-SRCS-$(CONFIG_MSVS) += build/make/gen_msvs_vcxproj.sh DIST-SRCS-$(CONFIG_MSVS) += build/make/msvs_common.sh diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh deleted file mode 100755 index 2b91fbfbc..000000000 --- a/build/make/gen_msvs_proj.sh +++ /dev/null @@ -1,490 +0,0 @@ -#!/bin/bash -## -## Copyright (c) 2010 The WebM project authors. All Rights Reserved. -## -## Use of this source code is governed by a BSD-style license -## that can be found in the LICENSE file in the root of the source -## tree. An additional intellectual property rights grant can be found -## in the file PATENTS. All contributing project authors may -## be found in the AUTHORS file in the root of the source tree. -## - -self=$0 -self_basename=${self##*/} -self_dirname=$(dirname "$0") - -. "$self_dirname/msvs_common.sh"|| exit 127 - -show_help() { - cat <&2 - IFS=* - - open_tag Filter \ - Name=$name \ - Filter=$pats \ - UniqueIdentifier=`generate_uuid` \ - - file_list_sz=${#file_list[@]} - for i in ${!file_list[@]}; do - f=${file_list[i]} - for pat in ${pats//;/$IFS}; do - if [ "${f##*.}" == "$pat" ]; then - unset file_list[i] - - objf=$(echo ${f%.*}.obj \ - | sed -e "s,$src_path_bare,," \ - -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') - open_tag File RelativePath="$f" - - if [ "$pat" == "asm" ] && $asm_use_custom_step; then - # Avoid object file name collisions, i.e. vpx_config.c and - # vpx_config.asm produce the same object file without - # this additional suffix. - objf=${objf%.obj}_asm.obj - for plat in "${platforms[@]}"; do - for cfg in Debug Release; do - open_tag FileConfiguration \ - Name="${cfg}|${plat}" \ - - tag Tool \ - Name="VCCustomBuildTool" \ - Description="Assembling \$(InputFileName)" \ - CommandLine="$(eval echo \$asm_${cfg}_cmdline) -o \$(IntDir)\\$objf" \ - Outputs="\$(IntDir)\\$objf" \ - - close_tag FileConfiguration - done - done - fi - if [ "$pat" == "c" ] || \ - [ "$pat" == "cc" ] || [ "$pat" == "cpp" ]; then - for plat in "${platforms[@]}"; do - for cfg in Debug Release; do - open_tag FileConfiguration \ - Name="${cfg}|${plat}" \ - - tag Tool \ - Name="VCCLCompilerTool" \ - ObjectFile="\$(IntDir)\\$objf" \ - - close_tag FileConfiguration - done - done - fi - close_tag File - - break - fi - done - done - - close_tag Filter - IFS="$saveIFS" -} - -# Process command line -unset target -for opt in "$@"; do - optval="${opt#*=}" - case "$opt" in - --help|-h) show_help - ;; - --target=*) target="${optval}" - ;; - --out=*) outfile="$optval" - ;; - --name=*) name="${optval}" - ;; - --proj-guid=*) guid="${optval}" - ;; - --module-def=*) link_opts="${link_opts} ModuleDefinitionFile=${optval}" - ;; - --exe) proj_kind="exe" - ;; - --dll) proj_kind="dll" - ;; - --lib) proj_kind="lib" - ;; - --src-path-bare=*) - src_path_bare=$(fix_path "$optval") - src_path_bare=${src_path_bare%/} - ;; - --static-crt) use_static_runtime=true - ;; - --ver=*) - vs_ver="$optval" - case "$optval" in - [789]) - ;; - *) die Unrecognized Visual Studio Version in $opt - ;; - esac - ;; - -I*) - opt=${opt##-I} - opt=$(fix_path "$opt") - opt="${opt%/}" - incs="${incs}${incs:+;}"${opt}"" - yasmincs="${yasmincs} -I"${opt}"" - ;; - -D*) defines="${defines}${defines:+;}${opt##-D}" - ;; - -L*) # fudge . to $(OutDir) - if [ "${opt##-L}" == "." ]; then - libdirs="${libdirs}${libdirs:+;}"\$(OutDir)"" - else - # Also try directories for this platform/configuration - opt=${opt##-L} - opt=$(fix_path "$opt") - libdirs="${libdirs}${libdirs:+;}"${opt}"" - libdirs="${libdirs}${libdirs:+;}"${opt}/\$(PlatformName)/\$(ConfigurationName)"" - libdirs="${libdirs}${libdirs:+;}"${opt}/\$(PlatformName)"" - fi - ;; - -l*) libs="${libs}${libs:+ }${opt##-l}.lib" - ;; - -*) die_unknown $opt - ;; - *) - # The paths in file_list are fixed outside of the loop. - file_list[${#file_list[@]}]="$opt" - case "$opt" in - *.asm) uses_asm=true - ;; - esac - ;; - esac -done - -# Make one call to fix_path for file_list to improve performance. -fix_file_list file_list - -outfile=${outfile:-/dev/stdout} -guid=${guid:-`generate_uuid`} -asm_use_custom_step=false -uses_asm=${uses_asm:-false} -case "${vs_ver:-8}" in - 7) vs_ver_id="7.10" - asm_use_custom_step=$uses_asm - warn_64bit='Detect64BitPortabilityProblems=true' - ;; - 8) vs_ver_id="8.00" - asm_use_custom_step=$uses_asm - warn_64bit='Detect64BitPortabilityProblems=true' - ;; - 9) vs_ver_id="9.00" - asm_use_custom_step=$uses_asm - warn_64bit='Detect64BitPortabilityProblems=false' - ;; -esac - -[ -n "$name" ] || die "Project name (--name) must be specified!" -[ -n "$target" ] || die "Target (--target) must be specified!" - -if ${use_static_runtime:-false}; then - release_runtime=0 - debug_runtime=1 - lib_sfx=mt -else - release_runtime=2 - debug_runtime=3 - lib_sfx=md -fi - -# Calculate debug lib names: If a lib ends in ${lib_sfx}.lib, then rename -# it to ${lib_sfx}d.lib. This precludes linking to release libs from a -# debug exe, so this may need to be refactored later. -for lib in ${libs}; do - if [ "$lib" != "${lib%${lib_sfx}.lib}" ]; then - lib=${lib%.lib}d.lib - fi - debug_libs="${debug_libs}${debug_libs:+ }${lib}" -done - - -# List Keyword for this target -case "$target" in - x86*) keyword="ManagedCProj" - ;; - *) die "Unsupported target $target!" -esac - -# List of all platforms supported for this target -case "$target" in - x86_64*) - platforms[0]="x64" - asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "\$(InputPath)"" - asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "\$(InputPath)"" - ;; - x86*) - platforms[0]="Win32" - asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "\$(InputPath)"" - asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "\$(InputPath)"" - ;; - *) die "Unsupported target $target!" - ;; -esac - -generate_vcproj() { - case "$proj_kind" in - exe) vs_ConfigurationType=1 - ;; - dll) vs_ConfigurationType=2 - ;; - *) vs_ConfigurationType=4 - ;; - esac - - echo "" - open_tag VisualStudioProject \ - ProjectType="Visual C++" \ - Version="${vs_ver_id}" \ - Name="${name}" \ - ProjectGUID="{${guid}}" \ - RootNamespace="${name}" \ - Keyword="${keyword}" \ - - open_tag Platforms - for plat in "${platforms[@]}"; do - tag Platform Name="$plat" - done - close_tag Platforms - - open_tag Configurations - for plat in "${platforms[@]}"; do - plat_no_ws=`echo $plat | sed 's/[^A-Za-z0-9_]/_/g'` - open_tag Configuration \ - Name="Debug|$plat" \ - OutputDirectory="\$(SolutionDir)$plat_no_ws/\$(ConfigurationName)" \ - IntermediateDirectory="$plat_no_ws/\$(ConfigurationName)/${name}" \ - ConfigurationType="$vs_ConfigurationType" \ - CharacterSet="1" \ - - case "$target" in - x86*) - case "$name" in - vpx) - tag Tool \ - Name="VCCLCompilerTool" \ - Optimization="0" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \ - RuntimeLibrary="$debug_runtime" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="2" \ - $warn_64bit \ - - $uses_asm && tag Tool Name="YASM" IncludePaths="$incs" Debug="true" - ;; - *) - tag Tool \ - Name="VCCLCompilerTool" \ - Optimization="0" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \ - RuntimeLibrary="$debug_runtime" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="2" \ - $warn_64bit \ - - $uses_asm && tag Tool Name="YASM" IncludePaths="$incs" Debug="true" - ;; - esac - ;; - esac - - case "$proj_kind" in - exe) - case "$target" in - x86*) - case "$name" in - *) - tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="$debug_libs \$(NoInherit)" \ - AdditionalLibraryDirectories="$libdirs" \ - GenerateDebugInformation="true" \ - ProgramDatabaseFile="\$(OutDir)/${name}.pdb" \ - ;; - esac - ;; - esac - ;; - lib) - case "$target" in - x86*) - tag Tool \ - Name="VCLibrarianTool" \ - OutputFile="\$(OutDir)/${name}${lib_sfx}d.lib" \ - - ;; - esac - ;; - dll) - tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="\$(NoInherit)" \ - LinkIncremental="2" \ - GenerateDebugInformation="true" \ - AssemblyDebug="1" \ - TargetMachine="1" \ - $link_opts \ - - ;; - esac - - close_tag Configuration - - open_tag Configuration \ - Name="Release|$plat" \ - OutputDirectory="\$(SolutionDir)$plat_no_ws/\$(ConfigurationName)" \ - IntermediateDirectory="$plat_no_ws/\$(ConfigurationName)/${name}" \ - ConfigurationType="$vs_ConfigurationType" \ - CharacterSet="1" \ - WholeProgramOptimization="0" \ - - case "$target" in - x86*) - case "$name" in - vpx) - tag Tool \ - Name="VCCLCompilerTool" \ - Optimization="2" \ - FavorSizeorSpeed="1" \ - AdditionalIncludeDirectories="$incs" \ - PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \ - RuntimeLibrary="$release_runtime" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="0" \ - $warn_64bit \ - - $uses_asm && tag Tool Name="YASM" IncludePaths="$incs" - ;; - *) - tag Tool \ - Name="VCCLCompilerTool" \ - AdditionalIncludeDirectories="$incs" \ - Optimization="2" \ - FavorSizeorSpeed="1" \ - PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \ - RuntimeLibrary="$release_runtime" \ - UsePrecompiledHeader="0" \ - WarningLevel="3" \ - DebugInformationFormat="0" \ - $warn_64bit \ - - $uses_asm && tag Tool Name="YASM" IncludePaths="$incs" - ;; - esac - ;; - esac - - case "$proj_kind" in - exe) - case "$target" in - x86*) - case "$name" in - *) - tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="$libs \$(NoInherit)" \ - AdditionalLibraryDirectories="$libdirs" \ - - ;; - esac - ;; - esac - ;; - lib) - case "$target" in - x86*) - tag Tool \ - Name="VCLibrarianTool" \ - OutputFile="\$(OutDir)/${name}${lib_sfx}.lib" \ - - ;; - esac - ;; - dll) # note differences to debug version: LinkIncremental, AssemblyDebug - tag Tool \ - Name="VCLinkerTool" \ - AdditionalDependencies="\$(NoInherit)" \ - LinkIncremental="1" \ - GenerateDebugInformation="true" \ - TargetMachine="1" \ - $link_opts \ - - ;; - esac - - close_tag Configuration - done - close_tag Configurations - - open_tag Files - generate_filter srcs "Source Files" "c;cc;cpp;def;odl;idl;hpj;bat;asm;asmx" - generate_filter hdrs "Header Files" "h;hm;inl;inc;xsd" - generate_filter resrcs "Resource Files" "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - generate_filter resrcs "Build Files" "mk" - close_tag Files - - tag Globals - close_tag VisualStudioProject - - # This must be done from within the {} subshell - echo "Ignored files list (${#file_list[@]} items) is:" >&2 - for f in "${file_list[@]}"; do - echo " $f" >&2 - done -} - -generate_vcproj | - sed -e '/"/s;\([^ "]\)/;\1\\;g' > ${outfile} - -exit - diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh index 664b404c9..7d5f46810 100755 --- a/build/make/gen_msvs_sln.sh +++ b/build/make/gen_msvs_sln.sh @@ -55,16 +55,11 @@ indent_pop() { parse_project() { local file=$1 - if [ "$sfx" = "vcproj" ]; then - local name=`grep Name "$file" | awk 'BEGIN {FS="\""}{if (NR==1) print $2}'` - local guid=`grep ProjectGUID "$file" | awk 'BEGIN {FS="\""}{if (NR==1) print $2}'` - else - local name=`grep RootNamespace "$file" | sed 's,.*<.*>\(.*\).*,\1,'` - local guid=`grep ProjectGuid "$file" | sed 's,.*<.*>\(.*\).*,\1,'` - fi + local name=`grep RootNamespace "$file" | sed 's,.*<.*>\(.*\).*,\1,'` + local guid=`grep ProjectGuid "$file" | sed 's,.*<.*>\(.*\).*,\1,'` # save the project GUID to a varaible, normalizing to the basename of the - # vcproj file without the extension + # vcxproj file without the extension local var var=${file##*/} var=${var%%.${sfx}} @@ -72,13 +67,8 @@ parse_project() { eval "${var}_name=$name" eval "${var}_guid=$guid" - if [ "$sfx" = "vcproj" ]; then - cur_config_list=`grep -A1 '/dev/null 2>&1 && echo yes) .nodevenv.once: ${TAB}@echo " * \$(MSBUILD_TOOL) not found in path." @@ -204,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 " * add the Common7/IDE directory of your Visual Studio" ${TAB}@echo " * installation to your path, eg:" -${TAB}@echo " * C:\Program Files\Microsoft Visual Studio 8\Common7\IDE" +${TAB}@echo " * C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE" ${TAB}@echo " * " ${TAB}@touch \$@ CLEAN-OBJS += \$(if \$(found_devenv),,.nodevenv.once) @@ -221,16 +188,9 @@ clean:: ${TAB}rm -rf "$platform"/"$config" .PHONY: $nows_sln_config ifneq (\$(found_devenv),) - ifeq (\$(CONFIG_VS_VERSION),7) -$nows_sln_config: $outfile -${TAB}\$(MSBUILD_TOOL) $outfile -build "$config" - - else $nows_sln_config: $outfile ${TAB}\$(MSBUILD_TOOL) $outfile -m -t:Build \\ ${TAB}${TAB}-p:Configuration="$config" -p:Platform="$platform" - - endif else $nows_sln_config: $outfile .nodevenv.once ${TAB}@echo " * Skipping build of $sln_config (\$(MSBUILD_TOOL) not in path)." @@ -255,23 +215,12 @@ for opt in "$@"; do ;; --ver=*) vs_ver="$optval" case $optval in - [789]|10|11|12|14) + 10|11|12|14) ;; *) die Unrecognized Visual Studio Version in $opt ;; esac ;; - --ver=*) vs_ver="$optval" - case $optval in - 7) sln_vers="8.00" - sln_vers_str="Visual Studio .NET 2003" - ;; - [89]) - ;; - *) die "Unrecognized Visual Studio Version '$optval' in $opt" - ;; - esac - ;; --target=*) target="${optval}" ;; -*) die_unknown $opt @@ -281,16 +230,7 @@ for opt in "$@"; do done outfile=${outfile:-/dev/stdout} mkoutfile=${mkoutfile:-/dev/stdout} -case "${vs_ver:-8}" in - 7) sln_vers="8.00" - sln_vers_str="Visual Studio .NET 2003" - ;; - 8) sln_vers="9.00" - sln_vers_str="Visual Studio 2005" - ;; - 9) sln_vers="10.00" - sln_vers_str="Visual Studio 2008" - ;; +case "${vs_ver:-10}" in 10) sln_vers="11.00" sln_vers_str="Visual Studio 2010" ;; @@ -304,14 +244,7 @@ case "${vs_ver:-8}" in sln_vers_str="Visual Studio 2015" ;; esac -case "${vs_ver:-8}" in - [789]) - sfx=vcproj - ;; - 10|11|12|14) - sfx=vcxproj - ;; -esac +sfx=vcxproj for f in "${file_list[@]}"; do parse_project $f diff --git a/configure b/configure index f82ee046b..dbe910bdb 100755 --- a/configure +++ b/configure @@ -132,9 +132,6 @@ all_platforms="${all_platforms} x86-linux-icc" 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-vs7" -all_platforms="${all_platforms} x86-win32-vs8" -all_platforms="${all_platforms} x86-win32-vs9" all_platforms="${all_platforms} x86-win32-vs10" all_platforms="${all_platforms} x86-win32-vs11" all_platforms="${all_platforms} x86-win32-vs12" @@ -152,8 +149,6 @@ all_platforms="${all_platforms} x86_64-linux-gcc" 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-vs8" -all_platforms="${all_platforms} x86_64-win64-vs9" all_platforms="${all_platforms} x86_64-win64-vs10" all_platforms="${all_platforms} x86_64-win64-vs11" all_platforms="${all_platforms} x86_64-win64-vs12" @@ -645,18 +640,9 @@ process_toolchain() { case "$tgt_cc" in vs*) enable_feature msvs enable_feature solution - vs_version=${tgt_cc##vs} - case $vs_version in - [789]) - VCPROJ_SFX=vcproj - gen_vcproj_cmd=${source_path}/build/make/gen_msvs_proj.sh - ;; - 10|11|12|14) - VCPROJ_SFX=vcxproj - gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh - enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror" - ;; - esac + VCPROJ_SFX=vcxproj + gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh + enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror" all_targets="${all_targets} solution" INLINE="__forceinline" ;; diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index ddaf9395b..e6224b21a 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -25,20 +25,12 @@ #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" +#include "vpx_ports/msvc.h" // for round() using libvpx_test::ACMRandom; namespace { -#ifdef _MSC_VER -static int round(double x) { - if (x < 0) - return static_cast(ceil(x - 0.5)); - else - return static_cast(floor(x + 0.5)); -} -#endif - const int kNumCoeffs = 256; const double C1 = 0.995184726672197; const double C2 = 0.98078528040323; diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 16d88255e..278d72dfa 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -25,18 +25,11 @@ #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" +#include "vpx_ports/msvc.h" // for round() using libvpx_test::ACMRandom; namespace { -#ifdef _MSC_VER -static int round(double x) { - if (x < 0) - return static_cast(ceil(x - 0.5)); - else - return static_cast(floor(x + 0.5)); -} -#endif const int kNumCoeffs = 1024; const double kPi = 3.141592653589793238462643383279502884; diff --git a/test/idct8x8_test.cc b/test/idct8x8_test.cc index 7f9d751d6..04487c452 100644 --- a/test/idct8x8_test.cc +++ b/test/idct8x8_test.cc @@ -17,20 +17,12 @@ #include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "vpx/vpx_integer.h" +#include "vpx_ports/msvc.h" // for round() using libvpx_test::ACMRandom; namespace { -#ifdef _MSC_VER -static int round(double x) { - if (x < 0) - return static_cast(ceil(x - 0.5)); - else - return static_cast(floor(x + 0.5)); -} -#endif - void reference_dct_1d(double input[8], double output[8]) { const double kPi = 3.141592653589793238462643383279502884; const double kInvSqrt2 = 0.707106781186547524400844362104; @@ -86,7 +78,7 @@ TEST(VP9Idct8x8Test, AccuracyCheck) { reference_dct_2d(input, output_r); for (int j = 0; j < 64; ++j) - coeff[j] = round(output_r[j]); + coeff[j] = static_cast(round(output_r[j])); vpx_idct8x8_64_add_c(coeff, dst, 8); for (int j = 0; j < 64; ++j) { const int diff = dst[j] - src[j]; diff --git a/vp9/encoder/x86/vp9_dct_ssse3.c b/vp9/encoder/x86/vp9_dct_ssse3.c index b09eac0d1..1a1d4eabc 100644 --- a/vp9/encoder/x86/vp9_dct_ssse3.c +++ b/vp9/encoder/x86/vp9_dct_ssse3.c @@ -9,11 +9,6 @@ */ #include -#if defined(_MSC_VER) && _MSC_VER <= 1500 -// Need to include math.h before calling tmmintrin.h/intrin.h -// in certain versions of MSVS. -#include -#endif #include // SSSE3 #include "./vp9_rtcd.h" diff --git a/vp9/encoder/x86/vp9_frame_scale_ssse3.c b/vp9/encoder/x86/vp9_frame_scale_ssse3.c index 38af3b13a..23325d63b 100644 --- a/vp9/encoder/x86/vp9_frame_scale_ssse3.c +++ b/vp9/encoder/x86/vp9_frame_scale_ssse3.c @@ -8,11 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#if defined(_MSC_VER) && _MSC_VER <= 1500 -// Need to include math.h before calling tmmintrin.h/intrin.h -// in certain versions of MSVS. -#include -#endif #include // SSSE3 #include "./vp9_rtcd.h" diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index 829c9d132..2945c87ca 100644 --- a/vpx/vpx_integer.h +++ b/vpx/vpx_integer.h @@ -24,7 +24,7 @@ #define VPX_INLINE inline #endif -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) +#if defined(VPX_EMULATE_INTTYPES) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -33,16 +33,6 @@ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; -#define INT64_MAX _I64_MAX -#define INT32_MAX _I32_MAX -#define INT32_MIN _I32_MIN -#define INT16_MAX _I16_MAX -#define INT16_MIN _I16_MIN -#endif - #ifndef _UINTPTR_T_DEFINED typedef size_t uintptr_t; #endif diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c index b71867853..cbd22dcd0 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c @@ -8,10 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -// Due to a header conflict between math.h and intrinsics includes with ceil() -// in certain configurations under vs9 this include needs to precede -// immintrin.h. - #include #include "./vpx_dsp_rtcd.h" diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c index 6fd52087c..2bb0f4a24 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c @@ -8,10 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -// Due to a header conflict between math.h and intrinsics includes with ceil() -// in certain configurations under vs9 this include needs to precede -// tmmintrin.h. - #include #include "./vpx_dsp_rtcd.h" diff --git a/vpx_ports/bitops.h b/vpx_ports/bitops.h index 84ff3659f..19426faf0 100644 --- a/vpx_ports/bitops.h +++ b/vpx_ports/bitops.h @@ -16,8 +16,7 @@ #include "vpx_ports/msvc.h" #ifdef _MSC_VER -# include // the ceil() definition must precede intrin.h -# if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) +# if defined(_M_X64) || defined(_M_IX86) # include # define USE_MSC_INTRINSICS # endif