Menu
▾
▴
[OMPT-svn-commit] OpenMPT r20600 - in branches/OpenMPT-1.31: . build/premake build/vs2017winxp/ext build/vs2017winxpansi/ext build/vs2019win10/ext build/vs2019win7/ext build/vs2019win81/ext build/vs2022win10/ext build/vs2022win10clang/ext build/vs2022win7/ext build/vs2022win81/ext include/opus include/opus/celt include/opus/celt/arm include/opus/celt/mips include/opus/celt/x86 include/opus/dnn include/opus/include include/opus/silk include/opus/silk/arm include/opus/silk/fixed include/opus/silk/float include/opus/silk/float/x86 include/opus/silk/mips include/opus/silk/x86 include/opus/src include/opus/win32
Author: manx Date: Sun Apr 14 18:13:32 2024 New Revision: 20600 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20600 Log: Merged revision(s) 20477-20481 from trunk/OpenMPT: [Var] Opus: Update to v1.5.1 (2024-03-04) [Imp] Opus: Enable HARDENING. [Fix] Opus: Assume standard C99 headers for MSVC. [Imp] Opus: Enable optional AVX2 support on amd64 (not on x86 because of questionable gain due to way fewer registers being available). This penalizes system performance for earlier Intel AVX CPUs. See <https://gist.github.com/rygorous/32bc3ea8301dba09358fd2c64e02d774>. [Mod] Opus: Enable full DRED and NoLACE. This remains unused for now, but could be used with a future libopusfile for better decoding of corrupted Opus files. [Fix] Opus: Fix a plethora of build problems, in particular for optional AVX2 builds, pure SSE2 builds, and Clang builds. ........ [Fix] Opus: Fix typo. ........ [Ref] Opus: Silence warning. ........ [Var] Update .gitignore. ........ [Mod] build: Opus: Disable optional NoLACE/LACE/DEEP-PLC/DRED features of Opus 1.5. ........ Merged revision(s) 20580-20582 from trunk/OpenMPT: [Var] Opus: Update to v1.5.2 (2024-04-12) ........ [Var] Update gitignore. ........ [Var] Opus: Update to v1.5.2 (2024-04-12) ........ Added: branches/OpenMPT-1.31/include/opus/celt/x86/pitch_avx.c - copied unchanged from r20481, trunk/OpenMPT/include/opus/celt/x86/pitch_avx.c branches/OpenMPT-1.31/include/opus/celt/x86/x86_arch_macros.h - copied unchanged from r20481, trunk/OpenMPT/include/opus/celt/x86/x86_arch_macros.h branches/OpenMPT-1.31/include/opus/dnn/ (props changed) - copied from r20481, trunk/OpenMPT/include/opus/dnn/ branches/OpenMPT-1.31/include/opus/dnn/fargan_demo.c - copied unchanged from r20582, trunk/OpenMPT/include/opus/dnn/fargan_demo.c branches/OpenMPT-1.31/include/opus/silk/float/x86/ - copied from r20481, trunk/OpenMPT/include/opus/silk/float/x86/ branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_del_dec_avx2.c - copied, changed from r20481, trunk/OpenMPT/include/opus/silk/x86/NSQ_del_dec_avx2.c branches/OpenMPT-1.31/include/opus/src/extensions.c - copied unchanged from r20481, trunk/OpenMPT/include/opus/src/extensions.c Deleted: branches/OpenMPT-1.31/include/opus/dnn/lpcnet_demo.c branches/OpenMPT-1.31/include/opus/src/tansig_table.h branches/OpenMPT-1.31/include/opus/win32/ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.gitignore branches/OpenMPT-1.31/build/premake/ext-opus.lua branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/opus.vcxproj.filters branches/OpenMPT-1.31/include/opus/ (props changed) branches/OpenMPT-1.31/include/opus/COPYING branches/OpenMPT-1.31/include/opus/OpenMPT.txt branches/OpenMPT-1.31/include/opus/README branches/OpenMPT-1.31/include/opus/celt/arm/arm_celt_map.c branches/OpenMPT-1.31/include/opus/celt/arm/armcpu.c branches/OpenMPT-1.31/include/opus/celt/arm/armcpu.h branches/OpenMPT-1.31/include/opus/celt/arm/celt_neon_intr.c branches/OpenMPT-1.31/include/opus/celt/arm/pitch_neon_intr.c branches/OpenMPT-1.31/include/opus/celt/bands.c branches/OpenMPT-1.31/include/opus/celt/celt.h branches/OpenMPT-1.31/include/opus/celt/celt_decoder.c branches/OpenMPT-1.31/include/opus/celt/celt_encoder.c branches/OpenMPT-1.31/include/opus/celt/celt_lpc.c branches/OpenMPT-1.31/include/opus/celt/celt_lpc.h branches/OpenMPT-1.31/include/opus/celt/cpu_support.h branches/OpenMPT-1.31/include/opus/celt/entdec.c branches/OpenMPT-1.31/include/opus/celt/entdec.h branches/OpenMPT-1.31/include/opus/celt/entenc.c branches/OpenMPT-1.31/include/opus/celt/entenc.h branches/OpenMPT-1.31/include/opus/celt/laplace.c branches/OpenMPT-1.31/include/opus/celt/laplace.h branches/OpenMPT-1.31/include/opus/celt/mathops.h branches/OpenMPT-1.31/include/opus/celt/mips/celt_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/mips/mdct_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/mips/vq_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/os_support.h branches/OpenMPT-1.31/include/opus/celt/pitch.c branches/OpenMPT-1.31/include/opus/celt/pitch.h branches/OpenMPT-1.31/include/opus/celt/stack_alloc.h branches/OpenMPT-1.31/include/opus/celt/x86/celt_lpc_sse4_1.c branches/OpenMPT-1.31/include/opus/celt/x86/pitch_sse.h branches/OpenMPT-1.31/include/opus/celt/x86/vq_sse.h branches/OpenMPT-1.31/include/opus/celt/x86/vq_sse2.c branches/OpenMPT-1.31/include/opus/celt/x86/x86_celt_map.c branches/OpenMPT-1.31/include/opus/celt/x86/x86cpu.c branches/OpenMPT-1.31/include/opus/celt/x86/x86cpu.h branches/OpenMPT-1.31/include/opus/dnn/dred_rdovae_dec_data.c branches/OpenMPT-1.31/include/opus/dnn/dred_rdovae_enc_data.c branches/OpenMPT-1.31/include/opus/dnn/dump_data.c branches/OpenMPT-1.31/include/opus/dnn/fargan_data.c branches/OpenMPT-1.31/include/opus/dnn/lace_data.c branches/OpenMPT-1.31/include/opus/dnn/lpcnet_private.h branches/OpenMPT-1.31/include/opus/dnn/nolace_data.c branches/OpenMPT-1.31/include/opus/dnn/pitchdnn_data.c branches/OpenMPT-1.31/include/opus/dnn/plc_data.c branches/OpenMPT-1.31/include/opus/dnn/vec_avx.h branches/OpenMPT-1.31/include/opus/dnn/vec_neon.h branches/OpenMPT-1.31/include/opus/include/opus.h branches/OpenMPT-1.31/include/opus/include/opus_defines.h branches/OpenMPT-1.31/include/opus/include/opus_multistream.h branches/OpenMPT-1.31/include/opus/package_version branches/OpenMPT-1.31/include/opus/silk/API.h branches/OpenMPT-1.31/include/opus/silk/NSQ.c branches/OpenMPT-1.31/include/opus/silk/NSQ_del_dec.c branches/OpenMPT-1.31/include/opus/silk/PLC.c branches/OpenMPT-1.31/include/opus/silk/PLC.h branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_del_dec_arm.h branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_del_dec_neon_intr.c branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_neon.h branches/OpenMPT-1.31/include/opus/silk/arm/arm_silk_map.c branches/OpenMPT-1.31/include/opus/silk/control.h branches/OpenMPT-1.31/include/opus/silk/dec_API.c branches/OpenMPT-1.31/include/opus/silk/decode_frame.c branches/OpenMPT-1.31/include/opus/silk/enc_API.c branches/OpenMPT-1.31/include/opus/silk/fixed/encode_frame_FIX.c branches/OpenMPT-1.31/include/opus/silk/float/SigProc_FLP.h branches/OpenMPT-1.31/include/opus/silk/float/autocorrelation_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/burg_modified_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/corrMatrix_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/encode_frame_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_LPC_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_LTP_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_pitch_lags_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_pred_coefs_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/inner_product_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/main_FLP.h branches/OpenMPT-1.31/include/opus/silk/float/noise_shape_analysis_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/pitch_analysis_core_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/warped_autocorrelation_FLP.c branches/OpenMPT-1.31/include/opus/silk/init_decoder.c branches/OpenMPT-1.31/include/opus/silk/init_encoder.c branches/OpenMPT-1.31/include/opus/silk/main.h branches/OpenMPT-1.31/include/opus/silk/mips/NSQ_del_dec_mipsr1.h branches/OpenMPT-1.31/include/opus/silk/mips/macros_mipsr1.h branches/OpenMPT-1.31/include/opus/silk/structs.h branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_del_dec_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/VAD_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/VQ_WMat_EC_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/main_sse.h branches/OpenMPT-1.31/include/opus/silk/x86/x86_silk_map.c branches/OpenMPT-1.31/include/opus/src/analysis.c branches/OpenMPT-1.31/include/opus/src/mapping_matrix.c branches/OpenMPT-1.31/include/opus/src/mapping_matrix.h branches/OpenMPT-1.31/include/opus/src/mlp.c branches/OpenMPT-1.31/include/opus/src/mlp.h branches/OpenMPT-1.31/include/opus/src/mlp_data.c branches/OpenMPT-1.31/include/opus/src/opus.c branches/OpenMPT-1.31/include/opus/src/opus_decoder.c branches/OpenMPT-1.31/include/opus/src/opus_demo.c branches/OpenMPT-1.31/include/opus/src/opus_encoder.c branches/OpenMPT-1.31/include/opus/src/opus_multistream_decoder.c branches/OpenMPT-1.31/include/opus/src/opus_multistream_encoder.c branches/OpenMPT-1.31/include/opus/src/opus_private.h branches/OpenMPT-1.31/include/opus/src/opus_projection_encoder.c branches/OpenMPT-1.31/include/opus/src/repacketizer.c Modified: branches/OpenMPT-1.31/.gitignore ============================================================================== --- branches/OpenMPT-1.31/.gitignore Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/.gitignore Sun Apr 14 18:13:32 2024 (r20600) @@ -537,6 +537,8 @@ /include/opus/depcomp /include/opus/doc /include/opus/install-sh +/include/opus/lpcnet_headers.mk +/include/opus/lpcnet_sources.mk /include/opus/ltmain.sh /include/opus/m4 /include/opus/meson @@ -557,11 +559,12 @@ /include/opus/tests /include/opus/celt/meson.build /include/opus/celt/tests +/include/opus/dnn/README.md +/include/opus/dnn/meson.build /include/opus/include/meson.build /include/opus/silk/meson.build /include/opus/silk/tests /include/opus/src/meson.build -/include/opus/win32/VS2015 /include/opusenc/Makefile.am /include/opusenc/Makefile.in /include/opusenc/README.md Modified: branches/OpenMPT-1.31/build/premake/ext-opus.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake/ext-opus.lua Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/premake/ext-opus.lua Sun Apr 14 18:13:32 2024 (r20600) @@ -8,7 +8,9 @@ includedirs { "../../include/opus/include", "../../include/opus/celt", + "../../include/opus/dnn", "../../include/opus/silk", + "../../include/opus/silk/fixed", "../../include/opus/silk/float", "../../include/opus/src", "../../include/opus/win32", @@ -37,23 +39,231 @@ files { "../../include/opus/celt/x86/*.c", "../../include/opus/celt/x86/*.h", + "../../include/opus/silk/float/x86/*.c", + "../../include/opus/silk/float/x86/*.h", "../../include/opus/silk/x86/*.c", "../../include/opus/silk/x86/*.h", } filter {} + filter { "architecture:arm or arm64" } + files { + "../../include/opus/celt/arm/*.c", + "../../include/opus/celt/arm/*.h", + "../../include/opus/silk/float/arm/*.c", + "../../include/opus/silk/float/arm/*.h", + "../../include/opus/silk/arm/*.c", + "../../include/opus/silk/arm/*.h", + } + filter {} excludes { "../../include/opus/celt/opus_custom_demo.c", "../../include/opus/src/opus_compare.c", "../../include/opus/src/opus_demo.c", "../../include/opus/src/repacketizer_demo.c", } - defines { "HAVE_CONFIG_H" } + filter {} + defines { + "OPUS_BUILD=1", + "PACKAGE_VERISON=\"1.5.2\"", + "ENABLE_HARDENING=1", + "HAVE_STDINT_H=1", + "HAVE_STDIO_H=1", + "HAVE_STDLIB_H=1", + "HAVE_STRING_H=1", + "USE_ALLOCA=1", + } + filter {} + if false then -- NoLACE (OSCE) / LACE (OSCE) / DEEP-PLC (DEEP_PLC || DRED) / DRED (DRED). + filter {} + files { + "../../include/opus/dnn/*.c", + "../../include/opus/dnn/*.h", + } + defines { + "ENABLE_DEEP_PLC=1", + "ENABLE_DRED=1", + "ENABLE_OSCE=1", + } + filter {} + filter { "architecture:x86 or x86_64" } + files { + "../../include/opus/dnn/x86/*.c", + "../../include/opus/dnn/x86/*.h", + } + filter {} + filter { "architecture:arm or arm64" } + files { + "../../include/opus/dnn/arm/*.c", + "../../include/opus/dnn/arm/*.h", + } + filter {} + excludes { + "../../include/opus/dnn/dump_data.c", + "../../include/opus/dnn/fargan_demo.c", + "../../include/opus/dnn/lossgen.c", + "../../include/opus/dnn/lossgen_data.c", + "../../include/opus/dnn/lossgen_demo.c", + "../../include/opus/dnn/write_lpcnet_weights.c", + } + filter {} + end + filter {} + if _OPTIONS["clang"] then + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + } + excludes { + "../../include/opus/dnn/x86/nnet_avx2.c", + "../../include/opus/dnn/x86/nnet_sse4_1.c", + } + filter {} + filter { "architecture:x86_64" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_PRESUME_SSE=1", + "OPUS_X86_PRESUME_SSE2=1", + } + excludes { + "../../include/opus/dnn/x86/nnet_avx2.c", + "../../include/opus/dnn/x86/nnet_sse4_1.c", + } + filter {} + filter { "architecture:arm" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + filter {} + filter { "architecture:arm64" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + filter {} + else + if _OPTIONS["windows-version"] == "winxp" then + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + } + filter {} + else + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + } + filter {} + filter { "architecture:x86", "configurations:Checked" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:CheckedShared" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:Release" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:ReleaseShared" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + end + filter {} + filter { "architecture:x86_64" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + "OPUS_X86_MAY_HAVE_AVX2=1", + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:arm" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + defines { + --"OPUS_HAVE_RTCD=1", + --"CPU_INFO_BY_C=1", + --"OPUS_ARM_MAY_HAVE_DOTPROD=1", + --"OPUS_ARM_MAY_HAVE_EDSP=1", + --"OPUS_ARM_MAY_HAVE_MEDIA=1", + --"OPUS_ARM_MAY_HAVE_NEON=1", + --"OPUS_ARM_MAY_HAVE_NEON_INTR=1", + } + filter {} + filter { "architecture:arm64" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + defines { + --"OPUS_HAVE_RTCD=1", + --"CPU_INFO_BY_C=1", + --"OPUS_ARM_MAY_HAVE_DOTPROD=1", + --"OPUS_ARM_MAY_HAVE_EDSP=1", + --"OPUS_ARM_MAY_HAVE_MEDIA=1", + --"OPUS_ARM_MAY_HAVE_NEON=1", + --"OPUS_ARM_MAY_HAVE_NEON_INTR=1", + --"OPUS_ARM_PRESUME_NEON_INTR=1", + } + filter {} + end links { } filter { "action:vs*" } - buildoptions { "/wd4244", "/wd4334" } + buildoptions { + "/wd4244", + "/wd4305", + } filter {} filter { "action:vs*" } - buildoptions { "/wd6255", "/wd6297" } -- analyze + buildoptions { -- analyze + "/wd6255", + "/wd6297", + } filter {} filter { "kind:SharedLib" } defines { "DLL_EXPORT" } Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj Sun Apr 14 18:13:32 2024 (r20600) @@ -294,15 +294,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -314,14 +314,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -333,8 +333,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -344,7 +344,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -357,8 +357,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -367,7 +367,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -380,8 +380,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -392,7 +392,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -405,8 +405,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -416,7 +416,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -429,15 +429,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -450,14 +450,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -470,8 +470,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -481,7 +481,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -496,8 +496,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -506,7 +506,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -521,8 +521,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -533,7 +533,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -548,8 +548,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -559,7 +559,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -604,6 +604,7 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\celt_lpc_sse.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\pitch_sse.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\vq_sse.h" /> + <ClInclude Include="..\..\..\include\opus\celt\x86\x86_arch_macros.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h" /> <ClInclude Include="..\..\..\include\opus\include\opus.h" /> <ClInclude Include="..\..\..\include\opus\include\opus_custom.h" /> @@ -641,7 +642,6 @@ <ClInclude Include="..\..\..\include\opus\src\mapping_matrix.h" /> <ClInclude Include="..\..\..\include\opus\src\mlp.h" /> <ClInclude Include="..\..\..\include\opus\src\opus_private.h" /> - <ClInclude Include="..\..\..\include\opus\src\tansig_table.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\include\opus\celt\bands.c" /> @@ -663,6 +663,7 @@ <ClCompile Include="..\..\..\include\opus\celt\rate.c" /> <ClCompile Include="..\..\..\include\opus\celt\vq.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\celt_lpc_sse4_1.c" /> + <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_avx.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse2.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse4_1.c" /> @@ -738,6 +739,7 @@ <ClCompile Include="..\..\..\include\opus\silk\float\sort_FLP.c" /> <ClCompile Include="..\..\..\include\opus\silk\float\warped_autocorrelation_FLP.c" /> <ClCompile Include="..\..\..\include\opus\silk\float\wrappers_FLP.c" /> + <ClCompile Include="..\..\..\include\opus\silk\float\x86\inner_product_FLP_avx2.c" /> <ClCompile Include="..\..\..\include\opus\silk\gain_quant.c" /> <ClCompile Include="..\..\..\include\opus\silk\init_decoder.c" /> <ClCompile Include="..\..\..\include\opus\silk\init_encoder.c" /> @@ -774,12 +776,14 @@ <ClCompile Include="..\..\..\include\opus\silk\tables_other.c" /> <ClCompile Include="..\..\..\include\opus\silk\tables_pitch_lag.c" /> <ClCompile Include="..\..\..\include\opus\silk\tables_pulses_per_block.c" /> + <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_avx2.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\VAD_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\VQ_WMat_EC_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\x86_silk_map.c" /> <ClCompile Include="..\..\..\include\opus\src\analysis.c" /> + <ClCompile Include="..\..\..\include\opus\src\extensions.c" /> <ClCompile Include="..\..\..\include\opus\src\mapping_matrix.c" /> <ClCompile Include="..\..\..\include\opus\src\mlp.c" /> <ClCompile Include="..\..\..\include\opus\src\mlp_data.c" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters Sun Apr 14 18:13:32 2024 (r20600) @@ -16,6 +16,9 @@ <Filter Include="silk\float"> <UniqueIdentifier>{1DF5E91A-09AD-2B68-72B4-04C45E8BC658}</UniqueIdentifier> </Filter> + <Filter Include="silk\float\x86"> + <UniqueIdentifier>{520705BB-3ED5-F8C0-2769-69E713D6D425}</UniqueIdentifier> + </Filter> <Filter Include="silk\x86"> <UniqueIdentifier>{CD038233-B9D0-DC3E-E2E9-CAE6CE1512CD}</UniqueIdentifier> </Filter> @@ -123,6 +126,9 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\vq_sse.h"> <Filter>celt\x86</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\opus\celt\x86\x86_arch_macros.h"> + <Filter>celt\x86</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h"> <Filter>celt\x86</Filter> </ClInclude> @@ -234,9 +240,6 @@ <ClInclude Include="..\..\..\include\opus\src\opus_private.h"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\opus\src\tansig_table.h"> - <Filter>src</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\include\opus\celt\bands.c"> @@ -296,6 +299,9 @@ <ClCompile Include="..\..\..\include\opus\celt\x86\celt_lpc_sse4_1.c"> <Filter>celt\x86</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_avx.c"> + <Filter>celt\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse.c"> <Filter>celt\x86</Filter> </ClCompile> @@ -521,6 +527,9 @@ <ClCompile Include="..\..\..\include\opus\silk\float\wrappers_FLP.c"> <Filter>silk\float</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\silk\float\x86\inner_product_FLP_avx2.c"> + <Filter>silk\float\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\silk\gain_quant.c"> <Filter>silk</Filter> </ClCompile> @@ -629,6 +638,9 @@ <ClCompile Include="..\..\..\include\opus\silk\tables_pulses_per_block.c"> <Filter>silk</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_avx2.c"> + <Filter>silk\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_sse4_1.c"> <Filter>silk\x86</Filter> </ClCompile> @@ -647,6 +659,9 @@ <ClCompile Include="..\..\..\include\opus\src\analysis.c"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\src\extensions.c"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\src\mapping_matrix.c"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj Sun Apr 14 18:13:32 2024 (r20600) @@ -294,15 +294,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -314,14 +314,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -333,8 +333,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA... [truncated message content] |
