diff options
| author | Felicia Lim <flim@google.com> | 2017-07-05 17:36:56 -0700 |
|---|---|---|
| committer | Felicia Lim <flim@google.com> | 2017-07-07 09:42:55 -0700 |
| commit | 0c2090c324e4f2ba2a8621c8b083559bab74c7c5 (patch) | |
| tree | fea1ab0038bc4102569d1ab4ee57a0f973895570 /win32 | |
| parent | a7703b70699299f078a189e19b6915120cded732 (diff) | |
| download | libopus-0c2090c324e4f2ba2a8621c8b083559bab74c7c5.tar.gz | |
Opus 1.2.1android-o-iot-preview-5o-iot-preview-5
Change-Id: I551f1de5c5e121ac1275334e67c7e0f96ab18114
Test: - verified builds for arm*/mips*/x86*
- checked functionality using an emulator and stagefright
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/.gitignore | 26 | ||||
| -rw-r--r-- | win32/VS2015/celt.vcxproj | 593 | ||||
| -rw-r--r-- | win32/VS2015/celt.vcxproj.filters | 189 | ||||
| -rw-r--r-- | win32/VS2015/common.props | 82 | ||||
| -rw-r--r-- | win32/VS2015/opus.sln | 136 | ||||
| -rw-r--r-- | win32/VS2015/opus.vcxproj | 695 | ||||
| -rw-r--r-- | win32/VS2015/opus.vcxproj.filters | 476 | ||||
| -rw-r--r-- | win32/VS2015/opus_demo.vcxproj | 389 | ||||
| -rw-r--r-- | win32/VS2015/silk_common.vcxproj | 664 | ||||
| -rw-r--r-- | win32/VS2015/silk_common.vcxproj.filters | 336 | ||||
| -rw-r--r-- | win32/VS2015/silk_fixed.vcxproj | 493 | ||||
| -rw-r--r-- | win32/VS2015/silk_fixed.vcxproj.filters | 120 | ||||
| -rw-r--r-- | win32/VS2015/silk_float.vcxproj | 594 | ||||
| -rw-r--r-- | win32/VS2015/silk_float.vcxproj.filters | 129 | ||||
| -rw-r--r-- | win32/VS2015/test_opus_api.vcxproj | 389 | ||||
| -rw-r--r-- | win32/VS2015/test_opus_decode.vcxproj | 397 | ||||
| -rw-r--r-- | win32/VS2015/test_opus_encode.vcxproj | 398 | ||||
| -rw-r--r-- | win32/VS2015/test_opus_encode.vcxproj.filters | 3 | ||||
| -rw-r--r-- | win32/genversion.bat | 23 |
19 files changed, 1113 insertions, 5019 deletions
diff --git a/win32/.gitignore b/win32/.gitignore new file mode 100644 index 00000000..c17feab7 --- /dev/null +++ b/win32/.gitignore @@ -0,0 +1,26 @@ +# Visual Studio ignores +[Dd]ebug/ +[Dd]ebugDLL/ +[Dd]ebugDLL_fixed/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleaseDLL/ +[Rr]eleaseDLL_fixed/ +[Rr]eleases/ +*.manifest +*.lastbuildstate +*.lib +*.log +*.idb +*.ipdb +*.ilk +*.iobj +*.obj +*.opensdf +*.pdb +*.sdf +*.suo +*.tlog +*.vcxproj.user +*.vc.db +*.vc.opendb diff --git a/win32/VS2015/celt.vcxproj b/win32/VS2015/celt.vcxproj deleted file mode 100644 index 273ee4df..00000000 --- a/win32/VS2015/celt.vcxproj +++ /dev/null @@ -1,593 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="DebugDLL|Win32"> - <Configuration>DebugDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugDLL|x64"> - <Configuration>DebugDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|Win32"> - <Configuration>ReleaseDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|x64"> - <Configuration>ReleaseDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\celt\bands.c" /> - <ClCompile Include="..\..\celt\celt.c" /> - <ClCompile Include="..\..\celt\celt_decoder.c" /> - <ClCompile Include="..\..\celt\celt_encoder.c" /> - <ClCompile Include="..\..\celt\celt_lpc.c" /> - <ClCompile Include="..\..\celt\cwrs.c" /> - <ClCompile Include="..\..\celt\entcode.c" /> - <ClCompile Include="..\..\celt\entdec.c" /> - <ClCompile Include="..\..\celt\entenc.c" /> - <ClCompile Include="..\..\celt\kiss_fft.c" /> - <ClCompile Include="..\..\celt\laplace.c" /> - <ClCompile Include="..\..\celt\mathops.c" /> - <ClCompile Include="..\..\celt\mdct.c" /> - <ClCompile Include="..\..\celt\modes.c" /> - <ClCompile Include="..\..\celt\pitch.c" /> - <ClCompile Include="..\..\celt\quant_bands.c" /> - <ClCompile Include="..\..\celt\rate.c" /> - <ClCompile Include="..\..\celt\vq.c" /> - <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c" /> - <ClCompile Include="..\..\celt\x86\pitch_sse.c" /> - <ClCompile Include="..\..\celt\x86\pitch_sse2.c" /> - <ClCompile Include="..\..\celt\x86\pitch_sse4_1.c" /> - <ClCompile Include="..\..\celt\x86\x86cpu.c" /> - <ClCompile Include="..\..\celt\x86\x86_celt_map.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\celt\arch.h" /> - <ClInclude Include="..\..\celt\bands.h" /> - <ClInclude Include="..\..\celt\celt.h" /> - <ClInclude Include="..\..\celt\celt_lpc.h" /> - <ClInclude Include="..\..\celt\cwrs.h" /> - <ClInclude Include="..\..\celt\ecintrin.h" /> - <ClInclude Include="..\..\celt\entcode.h" /> - <ClInclude Include="..\..\celt\entdec.h" /> - <ClInclude Include="..\..\celt\entenc.h" /> - <ClInclude Include="..\..\celt\fixed_c5x.h" /> - <ClInclude Include="..\..\celt\fixed_c6x.h" /> - <ClInclude Include="..\..\celt\fixed_debug.h" /> - <ClInclude Include="..\..\celt\fixed_generic.h" /> - <ClInclude Include="..\..\celt\float_cast.h" /> - <ClInclude Include="..\..\celt\kiss_fft.h" /> - <ClInclude Include="..\..\celt\laplace.h" /> - <ClInclude Include="..\..\celt\mathops.h" /> - <ClInclude Include="..\..\celt\mdct.h" /> - <ClInclude Include="..\..\celt\mfrngcod.h" /> - <ClInclude Include="..\..\celt\modes.h" /> - <ClInclude Include="..\..\celt\os_support.h" /> - <ClInclude Include="..\..\celt\pitch.h" /> - <ClInclude Include="..\..\celt\quant_bands.h" /> - <ClInclude Include="..\..\celt\rate.h" /> - <ClInclude Include="..\..\celt\stack_alloc.h" /> - <ClInclude Include="..\..\celt\static_modes_fixed.h" /> - <ClInclude Include="..\..\celt\static_modes_float.h" /> - <ClInclude Include="..\..\celt\vq.h" /> - <ClInclude Include="..\..\celt\x86\celt_lpc_sse.h" /> - <ClInclude Include="..\..\celt\x86\pitch_sse.h" /> - <ClInclude Include="..\..\celt\x86\x86cpu.h" /> - <ClInclude Include="..\..\celt\_kiss_fft_guts.h" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{245603E3-F580-41A5-9632-B25FE3372CBF}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>celt</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <CustomBuildBeforeTargets> - </CustomBuildBeforeTargets> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <CustomBuildBeforeTargets /> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/celt.vcxproj.filters b/win32/VS2015/celt.vcxproj.filters deleted file mode 100644 index e9948faa..00000000 --- a/win32/VS2015/celt.vcxproj.filters +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\celt\celt_decoder.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\celt_encoder.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\celt_lpc.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\cwrs.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\entcode.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\entdec.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\entenc.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\kiss_fft.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\laplace.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\mathops.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\mdct.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\modes.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\pitch.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\quant_bands.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\rate.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\vq.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\bands.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\celt.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\pitch_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\pitch_sse2.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\pitch_sse4_1.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\x86_celt_map.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\celt\x86\x86cpu.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\celt\cwrs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\ecintrin.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\entcode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\entdec.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\entenc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\fixed_c5x.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\fixed_c6x.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\fixed_debug.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\fixed_generic.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\float_cast.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\kiss_fft.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\laplace.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\mathops.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\mdct.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\mfrngcod.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\modes.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\os_support.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\pitch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\quant_bands.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\rate.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\stack_alloc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\static_modes_fixed.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\static_modes_float.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\vq.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\_kiss_fft_guts.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\arch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\bands.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\celt.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\celt_lpc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\x86\celt_lpc_sse.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\x86\pitch_sse.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\celt\x86\x86cpu.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/common.props b/win32/VS2015/common.props new file mode 100644 index 00000000..6c757d8b --- /dev/null +++ b/win32/VS2015/common.props @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets" /> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> + <CharacterSet Condition="'$(ConfigurationType)'=='Application'">Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DebugDLL' or '$(Configuration)'=='DebugDLL_fixed'"> + <LinkIncremental>true</LinkIncremental> + <UseDebugLibraries>true</UseDebugLibraries> + <WholeProgramOptimization>false</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='ReleaseDLL' or '$(Configuration)'=='ReleaseDLL_fixed'"> + <LinkIncremental>false</LinkIncremental> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <CompileAsManaged>false</CompileAsManaged> + <CompileAsWinRT>false</CompileAsWinRT> + <AdditionalIncludeDirectories>..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <OpenMPSupport>false</OpenMPSupport> + </ClCompile> + <Lib> + <SubSystem>Console</SubSystem> + </Lib> + <Link> + <LargeAddressAware>true</LargeAddressAware> + <SubSystem>Console</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DebugDLL' or '$(Configuration)'=='DebugDLL_fixed'"> + <ClCompile> + <ControlFlowGuard>Guard</ControlFlowGuard> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet> + <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> + <FloatingPointExceptions>true</FloatingPointExceptions> + <FunctionLevelLinking>false</FunctionLevelLinking> + <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> + <MultiProcessorCompilation>false</MultiProcessorCompilation> + <OmitFramePointers>false</OmitFramePointers> + <Optimization>Disabled</Optimization> + <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)'!='Debug'">MultiThreadedDebugDLL</RuntimeLibrary> + <SDLCheck>true</SDLCheck> + <StringPooling>false</StringPooling> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='ReleaseDLL' or '$(Configuration)'=='ReleaseDLL_fixed'"> + <ClCompile> + <ControlFlowGuard>false</ControlFlowGuard> + <DebugInformationFormat>None</DebugInformationFormat> + <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> + <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> + <ExceptionHandling>false</ExceptionHandling> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <FloatingPointModel Condition="'$(Configuration)'=='Release'">Fast</FloatingPointModel> + <FloatingPointModel Condition="'$(Configuration)'!='Release'">Precise</FloatingPointModel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <Optimization>MaxSpeed</Optimization> + <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)'!='Release'">MultiThreadedDLL</RuntimeLibrary> + <StructMemberAlignment>16Bytes</StructMemberAlignment> + </ClCompile> + <Link> + <GenerateDebugInformation>false</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup /> +</Project>
\ No newline at end of file diff --git a/win32/VS2015/opus.sln b/win32/VS2015/opus.sln index 24bead43..7b678e7f 100644 --- a/win32/VS2015/opus.sln +++ b/win32/VS2015/opus.sln @@ -1,64 +1,42 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "opus.vcxproj", "{219EC965-228A-1824-174D-96449D05F88A}" - ProjectSection(ProjectDependencies) = postProject - {8484C90D-1561-402F-A91D-2DB10F8C5171} = {8484C90D-1561-402F-A91D-2DB10F8C5171} - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "celt", "celt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus_demo", "opus_demo.vcxproj", "{016C739D-6389-43BF-8D88-24B2BF6F620F}" ProjectSection(ProjectDependencies) = postProject {219EC965-228A-1824-174D-96449D05F88A} = {219EC965-228A-1824-174D-96449D05F88A} - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opus_api", "test_opus_api.vcxproj", "{1D257A17-D254-42E5-82D6-1C87A6EC775A}" ProjectSection(ProjectDependencies) = postProject {219EC965-228A-1824-174D-96449D05F88A} = {219EC965-228A-1824-174D-96449D05F88A} - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opus_decode", "test_opus_decode.vcxproj", "{8578322A-1883-486B-B6FA-E0094B65C9F2}" ProjectSection(ProjectDependencies) = postProject {219EC965-228A-1824-174D-96449D05F88A} = {219EC965-228A-1824-174D-96449D05F88A} - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_opus_encode", "test_opus_encode.vcxproj", "{84DAA768-1A38-4312-BB61-4C78BB59E5B8}" ProjectSection(ProjectDependencies) = postProject {219EC965-228A-1824-174D-96449D05F88A} = {219EC965-228A-1824-174D-96449D05F88A} - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} = {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_float", "silk_float.vcxproj", "{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_common", "silk_common.vcxproj", "{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_fixed", "silk_fixed.vcxproj", "{8484C90D-1561-402F-A91D-2DB10F8C5171}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + DebugDLL_fixed|Win32 = DebugDLL_fixed|Win32 + DebugDLL_fixed|x64 = DebugDLL_fixed|x64 DebugDLL|Win32 = DebugDLL|Win32 DebugDLL|x64 = DebugDLL|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 + ReleaseDLL_fixed|Win32 = ReleaseDLL_fixed|Win32 + ReleaseDLL_fixed|x64 = ReleaseDLL_fixed|x64 ReleaseDLL|Win32 = ReleaseDLL|Win32 ReleaseDLL|x64 = ReleaseDLL|x64 EndGlobalSection @@ -67,6 +45,10 @@ Global {219EC965-228A-1824-174D-96449D05F88A}.Debug|Win32.Build.0 = Debug|Win32 {219EC965-228A-1824-174D-96449D05F88A}.Debug|x64.ActiveCfg = Debug|x64 {219EC965-228A-1824-174D-96449D05F88A}.Debug|x64.Build.0 = Debug|x64 + {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL_fixed|Win32.ActiveCfg = DebugDLL_fixed|Win32 + {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL_fixed|Win32.Build.0 = DebugDLL_fixed|Win32 + {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL_fixed|x64.ActiveCfg = DebugDLL_fixed|x64 + {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL_fixed|x64.Build.0 = DebugDLL_fixed|x64 {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {219EC965-228A-1824-174D-96449D05F88A}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 @@ -75,30 +57,22 @@ Global {219EC965-228A-1824-174D-96449D05F88A}.Release|Win32.Build.0 = Release|Win32 {219EC965-228A-1824-174D-96449D05F88A}.Release|x64.ActiveCfg = Release|x64 {219EC965-228A-1824-174D-96449D05F88A}.Release|x64.Build.0 = Release|x64 + {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL_fixed|Win32.ActiveCfg = ReleaseDLL_fixed|Win32 + {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL_fixed|Win32.Build.0 = ReleaseDLL_fixed|Win32 + {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL_fixed|x64.ActiveCfg = ReleaseDLL_fixed|x64 + {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL_fixed|x64.Build.0 = ReleaseDLL_fixed|x64 {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 {219EC965-228A-1824-174D-96449D05F88A}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.ActiveCfg = Debug|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|Win32.Build.0 = Debug|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.ActiveCfg = Debug|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Debug|x64.Build.0 = Debug|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.ActiveCfg = Release|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|Win32.Build.0 = Release|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.ActiveCfg = Release|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.Release|x64.Build.0 = Release|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {245603E3-F580-41A5-9632-B25FE3372CBF}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 - {245603E3-F580-41A5-9632-B25FE3372CBF}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Debug|Win32.ActiveCfg = Debug|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Debug|Win32.Build.0 = Debug|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Debug|x64.ActiveCfg = Debug|x64 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Debug|x64.Build.0 = Debug|x64 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL_fixed|Win32.ActiveCfg = DebugDLL_fixed|Win32 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL_fixed|Win32.Build.0 = DebugDLL_fixed|Win32 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL_fixed|x64.ActiveCfg = DebugDLL_fixed|x64 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL_fixed|x64.Build.0 = DebugDLL_fixed|x64 {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 @@ -107,6 +81,10 @@ Global {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|Win32.Build.0 = Release|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|x64.ActiveCfg = Release|x64 {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|x64.Build.0 = Release|x64 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL_fixed|Win32.ActiveCfg = ReleaseDLL_fixed|Win32 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL_fixed|Win32.Build.0 = ReleaseDLL_fixed|Win32 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL_fixed|x64.ActiveCfg = ReleaseDLL_fixed|x64 + {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL_fixed|x64.Build.0 = ReleaseDLL_fixed|x64 {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {016C739D-6389-43BF-8D88-24B2BF6F620F}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 @@ -115,6 +93,10 @@ Global {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|Win32.Build.0 = Debug|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|x64.ActiveCfg = Debug|x64 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|x64.Build.0 = Debug|x64 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL_fixed|Win32.ActiveCfg = DebugDLL_fixed|Win32 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL_fixed|Win32.Build.0 = DebugDLL_fixed|Win32 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL_fixed|x64.ActiveCfg = DebugDLL_fixed|x64 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL_fixed|x64.Build.0 = DebugDLL_fixed|x64 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 @@ -123,6 +105,10 @@ Global {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|Win32.Build.0 = Release|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|x64.ActiveCfg = Release|x64 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|x64.Build.0 = Release|x64 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL_fixed|Win32.ActiveCfg = ReleaseDLL_fixed|Win32 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL_fixed|Win32.Build.0 = ReleaseDLL_fixed|Win32 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL_fixed|x64.ActiveCfg = ReleaseDLL_fixed|x64 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL_fixed|x64.Build.0 = ReleaseDLL_fixed|x64 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {1D257A17-D254-42E5-82D6-1C87A6EC775A}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 @@ -131,6 +117,10 @@ Global {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|Win32.Build.0 = Debug|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|x64.ActiveCfg = Debug|x64 {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|x64.Build.0 = Debug|x64 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL_fixed|Win32.ActiveCfg = DebugDLL_fixed|Win32 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL_fixed|Win32.Build.0 = DebugDLL_fixed|Win32 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL_fixed|x64.ActiveCfg = DebugDLL_fixed|x64 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL_fixed|x64.Build.0 = DebugDLL_fixed|x64 {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 @@ -139,6 +129,10 @@ Global {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|Win32.Build.0 = Release|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|x64.ActiveCfg = Release|x64 {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|x64.Build.0 = Release|x64 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL_fixed|Win32.ActiveCfg = ReleaseDLL_fixed|Win32 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL_fixed|Win32.Build.0 = ReleaseDLL_fixed|Win32 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL_fixed|x64.ActiveCfg = ReleaseDLL_fixed|x64 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL_fixed|x64.Build.0 = ReleaseDLL_fixed|x64 {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {8578322A-1883-486B-B6FA-E0094B65C9F2}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 @@ -147,6 +141,10 @@ Global {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|Win32.Build.0 = Debug|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|x64.ActiveCfg = Debug|x64 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|x64.Build.0 = Debug|x64 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL_fixed|Win32.ActiveCfg = DebugDLL_fixed|Win32 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL_fixed|Win32.Build.0 = DebugDLL_fixed|Win32 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL_fixed|x64.ActiveCfg = DebugDLL_fixed|x64 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL_fixed|x64.Build.0 = DebugDLL_fixed|x64 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 @@ -155,58 +153,14 @@ Global {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|Win32.Build.0 = Release|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|x64.ActiveCfg = Release|x64 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|x64.Build.0 = Release|x64 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL_fixed|Win32.ActiveCfg = ReleaseDLL_fixed|Win32 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL_fixed|Win32.Build.0 = ReleaseDLL_fixed|Win32 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL_fixed|x64.ActiveCfg = ReleaseDLL_fixed|x64 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL_fixed|x64.Build.0 = ReleaseDLL_fixed|x64 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.ActiveCfg = Debug|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|Win32.Build.0 = Debug|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.ActiveCfg = Debug|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Debug|x64.Build.0 = Debug|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.ActiveCfg = Release|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|Win32.Build.0 = Release|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.ActiveCfg = Release|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.Release|x64.Build.0 = Release|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.ActiveCfg = Debug|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|Win32.Build.0 = Debug|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.ActiveCfg = Debug|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Debug|x64.Build.0 = Debug|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.ActiveCfg = Release|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|Win32.Build.0 = Release|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.ActiveCfg = Release|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.Release|x64.Build.0 = Release|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.ActiveCfg = Debug|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|Win32.Build.0 = Debug|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.ActiveCfg = Debug|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Debug|x64.Build.0 = Debug|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.ActiveCfg = Release|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|Win32.Build.0 = Release|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.ActiveCfg = Release|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.Release|x64.Build.0 = Release|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 - {8484C90D-1561-402F-A91D-2DB10F8C5171}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj index 0559aa60..33bf706d 100644 --- a/win32/VS2015/opus.vcxproj +++ b/win32/VS2015/opus.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="DebugDLL_fixed|Win32"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="DebugDLL_fixed|x64"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="DebugDLL|Win32"> <Configuration>DebugDLL</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|Win32"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|x64"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="ReleaseDLL|Win32"> <Configuration>ReleaseDLL</Configuration> <Platform>Win32</Platform> @@ -38,534 +54,184 @@ <Keyword>Win32Proj</Keyword> <ProjectName>opus</ProjectName> <ProjectGuid>{219EC965-228A-1824-174D-96449D05F88A}</ProjectGuid> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <UseDebugLibraries>false</UseDebugLibraries> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> - <UseDebugLibraries>false</UseDebugLibraries> <ConfigurationType>DynamicLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <LinkIncremental>true</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <LinkIncremental>true</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <LinkIncremental>false</LinkIncremental> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <CustomBuildBeforeTargets> - </CustomBuildBeforeTargets> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <LinkIncremental>false</LinkIncremental> - <CustomBuildBeforeTargets /> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - <SmallerTypeCheck>false</SmallerTypeCheck> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - <Lib> - <SubSystem>Windows</SubSystem> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - <SmallerTypeCheck>false</SmallerTypeCheck> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - <Lib> - <SubSystem>Windows</SubSystem> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ItemDefinitionGroup> <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - <SmallerTypeCheck>false</SmallerTypeCheck> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> + <AdditionalIncludeDirectories>..\..\silk\fixed;..\..\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(ConfigurationType)'=='DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL_fixed' or '$(Configuration)'=='ReleaseDLL_fixed'">FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions Condition="'$(Platform)'=='Win32'">/arch:IA32 %(AdditionalOptions)</AdditionalOptions> </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> <Lib> - <SubSystem>Windows</SubSystem> + <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - <SmallerTypeCheck>false</SmallerTypeCheck> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <EnableCOMDATFolding>false</EnableCOMDATFolding> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - <Lib> - <SubSystem>Windows</SubSystem> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>None</DebugInformationFormat> - <IntrinsicFunctions>true</IntrinsicFunctions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <FunctionLevelLinking>true</FunctionLevelLinking> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>false</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <LinkStatus>false</LinkStatus> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>None</DebugInformationFormat> - <IntrinsicFunctions>true</IntrinsicFunctions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <FunctionLevelLinking>true</FunctionLevelLinking> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>false</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <LinkStatus>true</LinkStatus> - <LargeAddressAware>true</LargeAddressAware> - </Link> <PreBuildEvent> <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> <Message>Generating version.h</Message> </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>None</DebugInformationFormat> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <FunctionLevelLinking>true</FunctionLevelLinking> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <GenerateDebugInformation>false</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <LinkStatus>false</LinkStatus> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>None</DebugInformationFormat> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <FunctionLevelLinking>true</FunctionLevelLinking> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <GenerateDebugInformation>false</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>celt.lib;silk_common.lib;silk_fixed.lib;silk_float.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <LinkStatus>true</LinkStatus> - <LargeAddressAware>true</LargeAddressAware> - </Link> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\celt\arch.h" /> + <ClInclude Include="..\..\celt\bands.h" /> <ClInclude Include="..\..\celt\celt.h" /> + <ClInclude Include="..\..\celt\celt_lpc.h" /> + <ClInclude Include="..\..\celt\cwrs.h" /> + <ClInclude Include="..\..\celt\ecintrin.h" /> + <ClInclude Include="..\..\celt\entcode.h" /> <ClInclude Include="..\..\celt\entdec.h" /> <ClInclude Include="..\..\celt\entenc.h" /> + <ClInclude Include="..\..\celt\fixed_c5x.h" /> + <ClInclude Include="..\..\celt\fixed_c6x.h" /> + <ClInclude Include="..\..\celt\fixed_debug.h" /> + <ClInclude Include="..\..\celt\fixed_generic.h" /> <ClInclude Include="..\..\celt\float_cast.h" /> + <ClInclude Include="..\..\celt\kiss_fft.h" /> + <ClInclude Include="..\..\celt\laplace.h" /> + <ClInclude Include="..\..\celt\mathops.h" /> + <ClInclude Include="..\..\celt\mdct.h" /> + <ClInclude Include="..\..\celt\mfrngcod.h" /> + <ClInclude Include="..\..\celt\modes.h" /> <ClInclude Include="..\..\celt\os_support.h" /> + <ClInclude Include="..\..\celt\pitch.h" /> + <ClInclude Include="..\..\celt\quant_bands.h" /> + <ClInclude Include="..\..\celt\rate.h" /> <ClInclude Include="..\..\celt\stack_alloc.h" /> + <ClInclude Include="..\..\celt\static_modes_fixed.h" /> + <ClInclude Include="..\..\celt\static_modes_float.h" /> + <ClInclude Include="..\..\celt\vq.h" /> + <ClInclude Include="..\..\celt\x86\celt_lpc_sse.h" /> + <ClInclude Include="..\..\celt\x86\pitch_sse.h" /> + <ClInclude Include="..\..\celt\x86\vq_sse.h" /> + <ClInclude Include="..\..\celt\x86\x86cpu.h" /> + <ClInclude Include="..\..\celt\_kiss_fft_guts.h" /> <ClInclude Include="..\..\include\opus.h" /> <ClInclude Include="..\..\include\opus_defines.h" /> <ClInclude Include="..\..\include\opus_types.h" /> <ClInclude Include="..\..\include\opus_multistream.h" /> + <ClInclude Include="..\..\silk\API.h" /> + <ClInclude Include="..\..\silk\control.h" /> + <ClInclude Include="..\..\silk\debug.h" /> + <ClInclude Include="..\..\silk\define.h" /> + <ClInclude Include="..\..\silk\errors.h" /> + <ClInclude Include="..\..\silk\float\main_FLP.h" /> + <ClInclude Include="..\..\silk\float\SigProc_FLP.h" /> + <ClInclude Include="..\..\silk\float\structs_FLP.h" /> + <ClInclude Include="..\..\silk\Inlines.h" /> + <ClInclude Include="..\..\silk\MacroCount.h" /> + <ClInclude Include="..\..\silk\MacroDebug.h" /> + <ClInclude Include="..\..\silk\macros.h" /> + <ClInclude Include="..\..\silk\main.h" /> + <ClInclude Include="..\..\silk\pitch_est_defines.h" /> + <ClInclude Include="..\..\silk\PLC.h" /> + <ClInclude Include="..\..\silk\resampler_private.h" /> + <ClInclude Include="..\..\silk\resampler_rom.h" /> + <ClInclude Include="..\..\silk\resampler_structs.h" /> + <ClInclude Include="..\..\silk\structs.h" /> + <ClInclude Include="..\..\silk\tables.h" /> + <ClInclude Include="..\..\silk\tuning_parameters.h" /> + <ClInclude Include="..\..\silk\typedef.h" /> + <ClInclude Include="..\..\silk\x86\main_sse.h" /> <ClInclude Include="..\..\win32\config.h" /> <ClInclude Include="..\..\src\analysis.h" /> <ClInclude Include="..\..\src\mlp.h" /> @@ -573,11 +239,120 @@ <ClInclude Include="..\..\src\tansig_table.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\celt\bands.c" /> + <ClCompile Include="..\..\celt\celt.c" /> + <ClCompile Include="..\..\celt\celt_decoder.c" /> + <ClCompile Include="..\..\celt\celt_encoder.c" /> + <ClCompile Include="..\..\celt\celt_lpc.c" /> + <ClCompile Include="..\..\celt\cwrs.c" /> + <ClCompile Include="..\..\celt\entcode.c" /> + <ClCompile Include="..\..\celt\entdec.c" /> + <ClCompile Include="..\..\celt\entenc.c" /> + <ClCompile Include="..\..\celt\kiss_fft.c" /> + <ClCompile Include="..\..\celt\laplace.c" /> + <ClCompile Include="..\..\celt\mathops.c" /> + <ClCompile Include="..\..\celt\mdct.c" /> + <ClCompile Include="..\..\celt\modes.c" /> + <ClCompile Include="..\..\celt\pitch.c" /> + <ClCompile Include="..\..\celt\quant_bands.c" /> + <ClCompile Include="..\..\celt\rate.c" /> + <ClCompile Include="..\..\celt\vq.c" /> + <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c" /> + <ClCompile Include="..\..\celt\x86\pitch_sse.c" /> + <ClCompile Include="..\..\celt\x86\pitch_sse2.c" /> + <ClCompile Include="..\..\celt\x86\pitch_sse4_1.c" /> + <ClCompile Include="..\..\celt\x86\vq_sse2.c" /> + <ClCompile Include="..\..\celt\x86\x86cpu.c" /> + <ClCompile Include="..\..\celt\x86\x86_celt_map.c" /> + <ClCompile Include="..\..\silk\A2NLSF.c" /> + <ClCompile Include="..\..\silk\ana_filt_bank_1.c" /> + <ClCompile Include="..\..\silk\biquad_alt.c" /> + <ClCompile Include="..\..\silk\bwexpander.c" /> + <ClCompile Include="..\..\silk\bwexpander_32.c" /> + <ClCompile Include="..\..\silk\check_control_input.c" /> + <ClCompile Include="..\..\silk\CNG.c" /> + <ClCompile Include="..\..\silk\code_signs.c" /> + <ClCompile Include="..\..\silk\control_audio_bandwidth.c" /> + <ClCompile Include="..\..\silk\control_codec.c" /> + <ClCompile Include="..\..\silk\control_SNR.c" /> + <ClCompile Include="..\..\silk\debug.c" /> + <ClCompile Include="..\..\silk\decoder_set_fs.c" /> + <ClCompile Include="..\..\silk\decode_core.c" /> + <ClCompile Include="..\..\silk\decode_frame.c" /> + <ClCompile Include="..\..\silk\decode_indices.c" /> + <ClCompile Include="..\..\silk\decode_parameters.c" /> + <ClCompile Include="..\..\silk\decode_pitch.c" /> + <ClCompile Include="..\..\silk\decode_pulses.c" /> + <ClCompile Include="..\..\silk\dec_API.c" /> + <ClCompile Include="..\..\silk\encode_indices.c" /> + <ClCompile Include="..\..\silk\encode_pulses.c" /> + <ClCompile Include="..\..\silk\enc_API.c" /> + <ClCompile Include="..\..\silk\gain_quant.c" /> + <ClCompile Include="..\..\silk\HP_variable_cutoff.c" /> + <ClCompile Include="..\..\silk\init_decoder.c" /> + <ClCompile Include="..\..\silk\init_encoder.c" /> + <ClCompile Include="..\..\silk\inner_prod_aligned.c" /> + <ClCompile Include="..\..\silk\interpolate.c" /> + <ClCompile Include="..\..\silk\lin2log.c" /> + <ClCompile Include="..\..\silk\log2lin.c" /> + <ClCompile Include="..\..\silk\LPC_analysis_filter.c" /> + <ClCompile Include="..\..\silk\LPC_fit.c" /> + <ClCompile Include="..\..\silk\LPC_inv_pred_gain.c" /> + <ClCompile Include="..\..\silk\LP_variable_cutoff.c" /> + <ClCompile Include="..\..\silk\NLSF2A.c" /> + <ClCompile Include="..\..\silk\NLSF_decode.c" /> + <ClCompile Include="..\..\silk\NLSF_del_dec_quant.c" /> + <ClCompile Include="..\..\silk\NLSF_encode.c" /> + <ClCompile Include="..\..\silk\NLSF_stabilize.c" /> + <ClCompile Include="..\..\silk\NLSF_unpack.c" /> + <ClCompile Include="..\..\silk\NLSF_VQ.c" /> + <ClCompile Include="..\..\silk\NLSF_VQ_weights_laroia.c" /> + <ClCompile Include="..\..\silk\NSQ.c" /> + <ClCompile Include="..\..\silk\NSQ_del_dec.c" /> + <ClCompile Include="..\..\silk\pitch_est_tables.c" /> + <ClCompile Include="..\..\silk\PLC.c" /> + <ClCompile Include="..\..\silk\process_NLSFs.c" /> + <ClCompile Include="..\..\silk\quant_LTP_gains.c" /> + <ClCompile Include="..\..\silk\resampler.c" /> + <ClCompile Include="..\..\silk\resampler_down2.c" /> + <ClCompile Include="..\..\silk\resampler_down2_3.c" /> + <ClCompile Include="..\..\silk\resampler_private_AR2.c" /> + <ClCompile Include="..\..\silk\resampler_private_down_FIR.c" /> + <ClCompile Include="..\..\silk\resampler_private_IIR_FIR.c" /> + <ClCompile Include="..\..\silk\resampler_private_up2_HQ.c" /> + <ClCompile Include="..\..\silk\resampler_rom.c" /> + <ClCompile Include="..\..\silk\shell_coder.c" /> + <ClCompile Include="..\..\silk\sigm_Q15.c" /> + <ClCompile Include="..\..\silk\sort.c" /> + <ClCompile Include="..\..\silk\stereo_decode_pred.c" /> + <ClCompile Include="..\..\silk\stereo_encode_pred.c" /> + <ClCompile Include="..\..\silk\stereo_find_predictor.c" /> + <ClCompile Include="..\..\silk\stereo_LR_to_MS.c" /> + <ClCompile Include="..\..\silk\stereo_MS_to_LR.c" /> + <ClCompile Include="..\..\silk\stereo_quant_pred.c" /> + <ClCompile Include="..\..\silk\sum_sqr_shift.c" /> + <ClCompile Include="..\..\silk\tables_gain.c" /> + <ClCompile Include="..\..\silk\tables_LTP.c" /> + <ClCompile Include="..\..\silk\tables_NLSF_CB_NB_MB.c" /> + <ClCompile Include="..\..\silk\tables_NLSF_CB_WB.c" /> + <ClCompile Include="..\..\silk\tables_other.c" /> + <ClCompile Include="..\..\silk\tables_pitch_lag.c" /> + <ClCompile Include="..\..\silk\tables_pulses_per_block.c" /> + <ClCompile Include="..\..\silk\table_LSF_cos.c" /> + <ClCompile Include="..\..\silk\VAD.c" /> + <ClCompile Include="..\..\silk\VQ_WMat_EC.c" /> + <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c" /> + <ClCompile Include="..\..\silk\x86\NSQ_sse.c" /> + <ClCompile Include="..\..\silk\x86\VAD_sse.c" /> + <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c" /> + <ClCompile Include="..\..\silk\x86\x86_silk_map.c" /> <ClCompile Include="..\..\src\analysis.c" /> <ClCompile Include="..\..\src\mlp.c" /> <ClCompile Include="..\..\src\mlp_data.c" /> <ClCompile Include="..\..\src\opus.c" /> - <ClCompile Include="..\..\src\opus_compare.c" /> + <ClCompile Include="..\..\src\opus_compare.c"> + <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> <ClCompile Include="..\..\src\opus_decoder.c" /> <ClCompile Include="..\..\src\opus_encoder.c" /> <ClCompile Include="..\..\src\opus_multistream.c" /> @@ -585,6 +360,34 @@ <ClCompile Include="..\..\src\opus_multistream_encoder.c" /> <ClCompile Include="..\..\src\repacketizer.c" /> </ItemGroup> + <Choose> + <When Condition="'$(Configuration)'=='DebugDLL_fixed' or '$(Configuration)'=='ReleaseDLL_fixed' or $(PreprocessorDefinitions.Contains('FIXED_POINT'))"> + <ItemGroup> + <ClCompile Include="..\..\silk\fixed\*.c"> + <ExcludedFromBuild>false</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\silk\fixed\x86\*.c"> + <ExcludedFromBuild>false</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\silk\float\*.c"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + </When> + <Otherwise> + <ItemGroup> + <ClCompile Include="..\..\silk\fixed\*.c"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\silk\fixed\x86\*.c"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\silk\float\*.c"> + <ExcludedFromBuild>false</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + </Otherwise> + </Choose> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/win32/VS2015/opus.vcxproj.filters b/win32/VS2015/opus.vcxproj.filters index 71607783..bb82b640 100644 --- a/win32/VS2015/opus.vcxproj.filters +++ b/win32/VS2015/opus.vcxproj.filters @@ -63,8 +63,209 @@ <ClInclude Include="..\..\src\tansig_table.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\celt\x86\x86cpu.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\_kiss_fft_guts.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\bands.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\celt_lpc.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\x86\celt_lpc_sse.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\cwrs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\ecintrin.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\entcode.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\fixed_c5x.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\fixed_c6x.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\fixed_debug.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\fixed_generic.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\kiss_fft.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\laplace.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\mathops.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\mdct.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\mfrngcod.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\modes.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\pitch.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\x86\pitch_sse.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\quant_bands.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\rate.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\static_modes_fixed.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\static_modes_float.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\vq.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\typedef.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\API.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\control.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\debug.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\define.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\errors.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\Inlines.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\MacroCount.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\MacroDebug.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\macros.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\main.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\x86\main_sse.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\pitch_est_defines.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\PLC.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\resampler_private.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\resampler_rom.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\resampler_structs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\structs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\tables.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\tuning_parameters.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\float\main_FLP.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\float\SigProc_FLP.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\silk\float\structs_FLP.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\celt\x86\vq_sse.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\src\analysis.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\bands.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\celt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\celt_decoder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\celt_encoder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\celt_lpc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\cwrs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\entcode.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\entdec.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\entenc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\kiss_fft.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\laplace.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\mathops.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\mdct.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\mlp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\mlp_data.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\modes.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\src\opus.c"> <Filter>Source Files</Filter> </ClCompile> @@ -86,17 +287,284 @@ <ClCompile Include="..\..\src\opus_multistream_encoder.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\celt\pitch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\x86\pitch_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\x86\pitch_sse2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\x86\pitch_sse4_1.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\quant_bands.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\rate.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\src\repacketizer.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\src\analysis.c"> + <ClCompile Include="..\..\celt\vq.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\src\mlp.c"> + <ClCompile Include="..\..\celt\x86\x86_celt_map.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\src\mlp_data.c"> + <ClCompile Include="..\..\celt\x86\x86cpu.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\A2NLSF.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\ana_filt_bank_1.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\biquad_alt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\bwexpander.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\bwexpander_32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\check_control_input.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\CNG.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\code_signs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\control_audio_bandwidth.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\control_codec.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\control_SNR.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\debug.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\dec_API.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_core.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_frame.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_indices.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_parameters.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_pitch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decode_pulses.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\decoder_set_fs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\enc_API.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\encode_indices.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\encode_pulses.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\gain_quant.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\HP_variable_cutoff.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\init_decoder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\init_encoder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\inner_prod_aligned.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\interpolate.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\lin2log.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\log2lin.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\LP_variable_cutoff.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\LPC_analysis_filter.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\LPC_inv_pred_gain.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_decode.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_del_dec_quant.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_encode.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_stabilize.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_unpack.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_VQ.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF_VQ_weights_laroia.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NLSF2A.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NSQ.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\NSQ_del_dec.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\x86\NSQ_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\pitch_est_tables.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\PLC.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\process_NLSFs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\quant_LTP_gains.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_down2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_down2_3.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_private_AR2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_private_down_FIR.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_private_IIR_FIR.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_private_up2_HQ.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\resampler_rom.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\shell_coder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\sigm_Q15.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\sort.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_decode_pred.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_encode_pred.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_find_predictor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_LR_to_MS.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_MS_to_LR.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\stereo_quant_pred.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\sum_sqr_shift.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\table_LSF_cos.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_gain.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_LTP.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_NLSF_CB_NB_MB.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_NLSF_CB_WB.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_other.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_pitch_lag.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\tables_pulses_per_block.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\VAD.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\x86\VAD_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\VQ_WMat_EC.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\x86\x86_silk_map.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\silk\LPC_fit.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\celt\x86\vq_sse2.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/win32/VS2015/opus_demo.vcxproj b/win32/VS2015/opus_demo.vcxproj index 275241fe..f4344e53 100644 --- a/win32/VS2015/opus_demo.vcxproj +++ b/win32/VS2015/opus_demo.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="DebugDLL_fixed|Win32"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="DebugDLL_fixed|x64"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="DebugDLL|Win32"> <Configuration>DebugDLL</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|Win32"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|x64"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="ReleaseDLL|Win32"> <Configuration>ReleaseDLL</Configuration> <Platform>Win32</Platform> @@ -35,18 +51,9 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ProjectReference Include="celt.vcxproj"> - <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> - </ProjectReference> <ProjectReference Include="opus.vcxproj"> <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> </ProjectReference> - <ProjectReference Include="silk_common.vcxproj"> - <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> - </ProjectReference> - <ProjectReference Include="silk_float.vcxproj"> - <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> - </ProjectReference> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\opus_demo.c" /> @@ -55,59 +62,54 @@ <ProjectGuid>{016C739D-6389-43BF-8D88-24B2BF6F620F}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>opus_demo</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -115,331 +117,54 @@ </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> + <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/win32/VS2015/silk_common.vcxproj b/win32/VS2015/silk_common.vcxproj deleted file mode 100644 index 2df939b0..00000000 --- a/win32/VS2015/silk_common.vcxproj +++ /dev/null @@ -1,664 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="DebugDLL|Win32"> - <Configuration>DebugDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugDLL|x64"> - <Configuration>DebugDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|Win32"> - <Configuration>ReleaseDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|x64"> - <Configuration>ReleaseDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>src_common</RootNamespace> - <ProjectName>silk_common</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <CustomBuildBeforeTargets> - </CustomBuildBeforeTargets> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <CustomBuildBeforeTargets /> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FloatingPointModel>Fast</FloatingPointModel> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FloatingPointModel>Precise</FloatingPointModel> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <FloatingPointModel>Fast</FloatingPointModel> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FloatingPointModel>Precise</FloatingPointModel> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\include\opus_types.h" /> - <ClInclude Include="..\..\silk\x86\main_sse.h" /> - <ClInclude Include="..\..\silk\x86\SigProc_FIX_sse.h" /> - <ClInclude Include="..\..\win32\config.h" /> - <ClInclude Include="..\..\silk\control.h" /> - <ClInclude Include="..\..\silk\debug.h" /> - <ClInclude Include="..\..\silk\define.h" /> - <ClInclude Include="..\..\silk\errors.h" /> - <ClInclude Include="..\..\silk\Inlines.h" /> - <ClInclude Include="..\..\silk\MacroCount.h" /> - <ClInclude Include="..\..\silk\MacroDebug.h" /> - <ClInclude Include="..\..\silk\macros.h" /> - <ClInclude Include="..\..\silk\main.h" /> - <ClInclude Include="..\..\silk\pitch_est_defines.h" /> - <ClInclude Include="..\..\silk\PLC.h" /> - <ClInclude Include="..\..\silk\resampler_private.h" /> - <ClInclude Include="..\..\silk\resampler_rom.h" /> - <ClInclude Include="..\..\silk\resampler_structs.h" /> - <ClInclude Include="..\..\silk\API.h" /> - <ClInclude Include="..\..\silk\SigProc_FIX.h" /> - <ClInclude Include="..\..\silk\structs.h" /> - <ClInclude Include="..\..\silk\tables.h" /> - <ClInclude Include="..\..\silk\tuning_parameters.h" /> - <ClInclude Include="..\..\silk\typedef.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\A2NLSF.c" /> - <ClCompile Include="..\..\silk\ana_filt_bank_1.c" /> - <ClCompile Include="..\..\silk\biquad_alt.c" /> - <ClCompile Include="..\..\silk\bwexpander.c" /> - <ClCompile Include="..\..\silk\bwexpander_32.c" /> - <ClCompile Include="..\..\silk\check_control_input.c" /> - <ClCompile Include="..\..\silk\CNG.c" /> - <ClCompile Include="..\..\silk\code_signs.c" /> - <ClCompile Include="..\..\silk\control_audio_bandwidth.c" /> - <ClCompile Include="..\..\silk\control_codec.c" /> - <ClCompile Include="..\..\silk\control_SNR.c" /> - <ClCompile Include="..\..\silk\debug.c" /> - <ClCompile Include="..\..\silk\decoder_set_fs.c" /> - <ClCompile Include="..\..\silk\decode_core.c" /> - <ClCompile Include="..\..\silk\decode_frame.c" /> - <ClCompile Include="..\..\silk\decode_indices.c" /> - <ClCompile Include="..\..\silk\decode_parameters.c" /> - <ClCompile Include="..\..\silk\decode_pitch.c" /> - <ClCompile Include="..\..\silk\decode_pulses.c" /> - <ClCompile Include="..\..\silk\dec_API.c" /> - <ClCompile Include="..\..\silk\encode_indices.c" /> - <ClCompile Include="..\..\silk\encode_pulses.c" /> - <ClCompile Include="..\..\silk\enc_API.c" /> - <ClCompile Include="..\..\silk\gain_quant.c" /> - <ClCompile Include="..\..\silk\HP_variable_cutoff.c" /> - <ClCompile Include="..\..\silk\init_decoder.c" /> - <ClCompile Include="..\..\silk\init_encoder.c" /> - <ClCompile Include="..\..\silk\inner_prod_aligned.c" /> - <ClCompile Include="..\..\silk\interpolate.c" /> - <ClCompile Include="..\..\silk\lin2log.c" /> - <ClCompile Include="..\..\silk\log2lin.c" /> - <ClCompile Include="..\..\silk\LPC_analysis_filter.c" /> - <ClCompile Include="..\..\silk\LPC_inv_pred_gain.c" /> - <ClCompile Include="..\..\silk\LP_variable_cutoff.c" /> - <ClCompile Include="..\..\silk\NLSF2A.c" /> - <ClCompile Include="..\..\silk\NLSF_decode.c" /> - <ClCompile Include="..\..\silk\NLSF_del_dec_quant.c" /> - <ClCompile Include="..\..\silk\NLSF_encode.c" /> - <ClCompile Include="..\..\silk\NLSF_stabilize.c" /> - <ClCompile Include="..\..\silk\NLSF_unpack.c" /> - <ClCompile Include="..\..\silk\NLSF_VQ.c" /> - <ClCompile Include="..\..\silk\NLSF_VQ_weights_laroia.c" /> - <ClCompile Include="..\..\silk\NSQ.c" /> - <ClCompile Include="..\..\silk\NSQ_del_dec.c" /> - <ClCompile Include="..\..\silk\pitch_est_tables.c" /> - <ClCompile Include="..\..\silk\PLC.c" /> - <ClCompile Include="..\..\silk\process_NLSFs.c" /> - <ClCompile Include="..\..\silk\quant_LTP_gains.c" /> - <ClCompile Include="..\..\silk\resampler.c" /> - <ClCompile Include="..\..\silk\resampler_down2.c" /> - <ClCompile Include="..\..\silk\resampler_down2_3.c" /> - <ClCompile Include="..\..\silk\resampler_private_AR2.c" /> - <ClCompile Include="..\..\silk\resampler_private_down_FIR.c" /> - <ClCompile Include="..\..\silk\resampler_private_IIR_FIR.c" /> - <ClCompile Include="..\..\silk\resampler_private_up2_HQ.c" /> - <ClCompile Include="..\..\silk\resampler_rom.c" /> - <ClCompile Include="..\..\silk\shell_coder.c" /> - <ClCompile Include="..\..\silk\sigm_Q15.c" /> - <ClCompile Include="..\..\silk\sort.c" /> - <ClCompile Include="..\..\silk\stereo_decode_pred.c" /> - <ClCompile Include="..\..\silk\stereo_encode_pred.c" /> - <ClCompile Include="..\..\silk\stereo_find_predictor.c" /> - <ClCompile Include="..\..\silk\stereo_LR_to_MS.c" /> - <ClCompile Include="..\..\silk\stereo_MS_to_LR.c" /> - <ClCompile Include="..\..\silk\stereo_quant_pred.c" /> - <ClCompile Include="..\..\silk\sum_sqr_shift.c" /> - <ClCompile Include="..\..\silk\tables_gain.c" /> - <ClCompile Include="..\..\silk\tables_LTP.c" /> - <ClCompile Include="..\..\silk\tables_NLSF_CB_NB_MB.c" /> - <ClCompile Include="..\..\silk\tables_NLSF_CB_WB.c" /> - <ClCompile Include="..\..\silk\tables_other.c" /> - <ClCompile Include="..\..\silk\tables_pitch_lag.c" /> - <ClCompile Include="..\..\silk\tables_pulses_per_block.c" /> - <ClCompile Include="..\..\silk\table_LSF_cos.c" /> - <ClCompile Include="..\..\silk\VAD.c" /> - <ClCompile Include="..\..\silk\VQ_WMat_EC.c" /> - <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c" /> - <ClCompile Include="..\..\silk\x86\NSQ_sse.c" /> - <ClCompile Include="..\..\silk\x86\VAD_sse.c" /> - <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c" /> - <ClCompile Include="..\..\silk\x86\x86_silk_map.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/silk_common.vcxproj.filters b/win32/VS2015/silk_common.vcxproj.filters deleted file mode 100644 index c41064e7..00000000 --- a/win32/VS2015/silk_common.vcxproj.filters +++ /dev/null @@ -1,336 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\include\opus_types.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\win32\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\control.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\debug.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\define.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\errors.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\Inlines.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\MacroCount.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\MacroDebug.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\macros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\main.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\pitch_est_defines.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\PLC.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\resampler_private.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\resampler_rom.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\resampler_structs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\API.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\SigProc_FIX.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\structs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\tables.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\tuning_parameters.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\typedef.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\x86\main_sse.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\x86\SigProc_FIX_sse.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\VQ_WMat_EC.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\A2NLSF.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\ana_filt_bank_1.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\biquad_alt.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\bwexpander.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\bwexpander_32.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\check_control_input.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\CNG.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\code_signs.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\control_audio_bandwidth.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\control_codec.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\control_SNR.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\debug.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\dec_API.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_core.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_frame.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_indices.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_parameters.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_pitch.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decode_pulses.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\decoder_set_fs.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\enc_API.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\encode_indices.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\encode_pulses.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\gain_quant.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\HP_variable_cutoff.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\init_decoder.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\init_encoder.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\inner_prod_aligned.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\interpolate.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\lin2log.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\log2lin.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\LP_variable_cutoff.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\LPC_analysis_filter.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\LPC_inv_pred_gain.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_decode.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_del_dec_quant.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_encode.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_stabilize.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_unpack.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_VQ.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF_VQ_weights_laroia.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NLSF2A.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NSQ.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\NSQ_del_dec.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\pitch_est_tables.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\PLC.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\process_NLSFs.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\quant_LTP_gains.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_down2.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_down2_3.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_private_AR2.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_private_down_FIR.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_private_IIR_FIR.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_private_up2_HQ.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\resampler_rom.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\shell_coder.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\sigm_Q15.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\sort.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_decode_pred.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_encode_pred.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_find_predictor.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_LR_to_MS.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_MS_to_LR.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\stereo_quant_pred.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\sum_sqr_shift.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\table_LSF_cos.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_gain.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_LTP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_NLSF_CB_NB_MB.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_NLSF_CB_WB.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_other.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_pitch_lag.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\tables_pulses_per_block.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\VAD.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\x86\NSQ_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\x86\VAD_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\x86\x86_silk_map.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project> diff --git a/win32/VS2015/silk_fixed.vcxproj b/win32/VS2015/silk_fixed.vcxproj deleted file mode 100644 index ba1b5152..00000000 --- a/win32/VS2015/silk_fixed.vcxproj +++ /dev/null @@ -1,493 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="DebugDLL|Win32"> - <Configuration>DebugDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugDLL|x64"> - <Configuration>DebugDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|Win32"> - <Configuration>ReleaseDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|x64"> - <Configuration>ReleaseDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{8484C90D-1561-402F-A91D-2DB10F8C5171}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>src_FIX</RootNamespace> - <ProjectName>silk_fixed</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\include\opus_types.h" /> - <ClInclude Include="..\..\win32\config.h" /> - <ClInclude Include="..\..\silk\SigProc_FIX.h" /> - <ClInclude Include="..\..\silk\fixed\main_FIX.h" /> - <ClInclude Include="..\..\silk\fixed\structs_FIX.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\fixed\apply_sine_window_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\autocorr_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\burg_modified_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\corrMatrix_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\encode_frame_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\find_LPC_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\find_LTP_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\find_pitch_lags_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\find_pred_coefs_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\k2a_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\k2a_Q16_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\LTP_analysis_filter_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\LTP_scale_ctrl_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\noise_shape_analysis_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\pitch_analysis_core_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\prefilter_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\process_gains_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\regularize_correlations_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\residual_energy16_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\residual_energy_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\schur64_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\schur_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\solve_LS_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\vector_ops_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\warped_autocorrelation_FIX.c" /> - <ClCompile Include="..\..\silk\fixed\x86\burg_modified_FIX_sse.c" /> - <ClCompile Include="..\..\silk\fixed\x86\prefilter_FIX_sse.c" /> - <ClCompile Include="..\..\silk\fixed\x86\vector_ops_FIX_sse.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/silk_fixed.vcxproj.filters b/win32/VS2015/silk_fixed.vcxproj.filters deleted file mode 100644 index c2327ebf..00000000 --- a/win32/VS2015/silk_fixed.vcxproj.filters +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\win32\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\include\opus_types.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\SigProc_FIX.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\fixed\main_FIX.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\fixed\structs_FIX.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\fixed\LTP_scale_ctrl_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\noise_shape_analysis_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\pitch_analysis_core_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\prefilter_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\process_gains_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\regularize_correlations_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\residual_energy_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\residual_energy16_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\schur_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\schur64_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\solve_LS_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\vector_ops_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\warped_autocorrelation_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\apply_sine_window_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\autocorr_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\burg_modified_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\corrMatrix_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\encode_frame_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\find_LPC_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\find_LTP_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\find_pitch_lags_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\find_pred_coefs_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\k2a_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\k2a_Q16_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\LTP_analysis_filter_FIX.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\x86\burg_modified_FIX_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\x86\prefilter_FIX_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\fixed\x86\vector_ops_FIX_sse.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/silk_float.vcxproj b/win32/VS2015/silk_float.vcxproj deleted file mode 100644 index e55e76d1..00000000 --- a/win32/VS2015/silk_float.vcxproj +++ /dev/null @@ -1,594 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="DebugDLL|Win32"> - <Configuration>DebugDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugDLL|x64"> - <Configuration>DebugDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|Win32"> - <Configuration>ReleaseDLL</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseDLL|x64"> - <Configuration>ReleaseDLL</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>src_FLP</RootNamespace> - <ProjectName>silk_float</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <CustomBuildBeforeTargets>Compile</CustomBuildBeforeTargets> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <CustomBuildBeforeTargets>Compile</CustomBuildBeforeTargets> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../silk/float;../../silk;../../win32;../../celt;../../include;../win32</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <Lib> - <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> - </Lib> - <PreBuildEvent> - <Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command> - <Message>Generating version.h</Message> - </PreBuildEvent> - <CustomBuildStep> - <Command> - </Command> - </CustomBuildStep> - <CustomBuildStep> - <Outputs> - </Outputs> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\include\opus_types.h" /> - <ClInclude Include="..\..\win32\config.h" /> - <ClInclude Include="..\..\silk\float\main_FLP.h" /> - <ClInclude Include="..\..\silk\float\SigProc_FLP.h" /> - <ClInclude Include="..\..\silk\float\structs_FLP.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\float\apply_sine_window_FLP.c" /> - <ClCompile Include="..\..\silk\float\autocorrelation_FLP.c" /> - <ClCompile Include="..\..\silk\float\burg_modified_FLP.c" /> - <ClCompile Include="..\..\silk\float\bwexpander_FLP.c" /> - <ClCompile Include="..\..\silk\float\corrMatrix_FLP.c" /> - <ClCompile Include="..\..\silk\float\encode_frame_FLP.c" /> - <ClCompile Include="..\..\silk\float\energy_FLP.c" /> - <ClCompile Include="..\..\silk\float\find_LPC_FLP.c" /> - <ClCompile Include="..\..\silk\float\find_LTP_FLP.c" /> - <ClCompile Include="..\..\silk\float\find_pitch_lags_FLP.c" /> - <ClCompile Include="..\..\silk\float\find_pred_coefs_FLP.c" /> - <ClCompile Include="..\..\silk\float\inner_product_FLP.c" /> - <ClCompile Include="..\..\silk\float\k2a_FLP.c" /> - <ClCompile Include="..\..\silk\float\levinsondurbin_FLP.c" /> - <ClCompile Include="..\..\silk\float\LPC_analysis_filter_FLP.c" /> - <ClCompile Include="..\..\silk\float\LPC_inv_pred_gain_FLP.c" /> - <ClCompile Include="..\..\silk\float\LTP_analysis_filter_FLP.c" /> - <ClCompile Include="..\..\silk\float\LTP_scale_ctrl_FLP.c" /> - <ClCompile Include="..\..\silk\float\noise_shape_analysis_FLP.c" /> - <ClCompile Include="..\..\silk\float\pitch_analysis_core_FLP.c" /> - <ClCompile Include="..\..\silk\float\prefilter_FLP.c" /> - <ClCompile Include="..\..\silk\float\process_gains_FLP.c" /> - <ClCompile Include="..\..\silk\float\regularize_correlations_FLP.c" /> - <ClCompile Include="..\..\silk\float\residual_energy_FLP.c" /> - <ClCompile Include="..\..\silk\float\scale_copy_vector_FLP.c" /> - <ClCompile Include="..\..\silk\float\scale_vector_FLP.c" /> - <ClCompile Include="..\..\silk\float\schur_FLP.c" /> - <ClCompile Include="..\..\silk\float\solve_LS_FLP.c" /> - <ClCompile Include="..\..\silk\float\sort_FLP.c" /> - <ClCompile Include="..\..\silk\float\warped_autocorrelation_FLP.c" /> - <ClCompile Include="..\..\silk\float\wrappers_FLP.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/silk_float.vcxproj.filters b/win32/VS2015/silk_float.vcxproj.filters deleted file mode 100644 index 33d25baa..00000000 --- a/win32/VS2015/silk_float.vcxproj.filters +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\include\opus_types.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\win32\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\float\main_FLP.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\float\SigProc_FLP.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\silk\float\structs_FLP.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\silk\float\scale_vector_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\schur_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\solve_LS_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\sort_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\warped_autocorrelation_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\wrappers_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\apply_sine_window_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\autocorrelation_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\burg_modified_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\bwexpander_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\corrMatrix_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\encode_frame_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\energy_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\find_LPC_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\find_LTP_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\find_pitch_lags_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\find_pred_coefs_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\inner_product_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\k2a_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\levinsondurbin_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\LPC_analysis_filter_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\LPC_inv_pred_gain_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\LTP_analysis_filter_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\LTP_scale_ctrl_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\noise_shape_analysis_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\pitch_analysis_core_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\prefilter_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\process_gains_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\regularize_correlations_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\residual_energy_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\silk\float\scale_copy_vector_FLP.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/win32/VS2015/test_opus_api.vcxproj b/win32/VS2015/test_opus_api.vcxproj index 302752d1..7cae131b 100644 --- a/win32/VS2015/test_opus_api.vcxproj +++ b/win32/VS2015/test_opus_api.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="DebugDLL_fixed|Win32"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="DebugDLL_fixed|x64"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="DebugDLL|Win32"> <Configuration>DebugDLL</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|Win32"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|x64"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="ReleaseDLL|Win32"> <Configuration>ReleaseDLL</Configuration> <Platform>Win32</Platform> @@ -38,76 +54,62 @@ <ClCompile Include="..\..\tests\test_opus_api.c" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="celt.vcxproj"> - <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> - </ProjectReference> <ProjectReference Include="opus.vcxproj"> <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> </ProjectReference> - <ProjectReference Include="silk_common.vcxproj"> - <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> - </ProjectReference> - <ProjectReference Include="silk_float.vcxproj"> - <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> - </ProjectReference> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{1D257A17-D254-42E5-82D6-1C87A6EC775A}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>test_opus_api</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -115,331 +117,54 @@ </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> + <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/win32/VS2015/test_opus_decode.vcxproj b/win32/VS2015/test_opus_decode.vcxproj index ef6279c4..df01dca1 100644 --- a/win32/VS2015/test_opus_decode.vcxproj +++ b/win32/VS2015/test_opus_decode.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="DebugDLL_fixed|Win32"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="DebugDLL_fixed|x64"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="DebugDLL|Win32"> <Configuration>DebugDLL</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|Win32"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|x64"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="ReleaseDLL|Win32"> <Configuration>ReleaseDLL</Configuration> <Platform>Win32</Platform> @@ -38,76 +54,62 @@ <ClCompile Include="..\..\tests\test_opus_decode.c" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="celt.vcxproj"> - <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> - </ProjectReference> <ProjectReference Include="opus.vcxproj"> <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> </ProjectReference> - <ProjectReference Include="silk_common.vcxproj"> - <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> - </ProjectReference> - <ProjectReference Include="silk_float.vcxproj"> - <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> - </ProjectReference> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{8578322A-1883-486B-B6FA-E0094B65C9F2}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>test_opus_api</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -115,339 +117,54 @@ </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> + <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/win32/VS2015/test_opus_encode.vcxproj b/win32/VS2015/test_opus_encode.vcxproj index e2fa7257..405efee9 100644 --- a/win32/VS2015/test_opus_encode.vcxproj +++ b/win32/VS2015/test_opus_encode.vcxproj @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="DebugDLL_fixed|Win32"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="DebugDLL_fixed|x64"> + <Configuration>DebugDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="DebugDLL|Win32"> <Configuration>DebugDLL</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|Win32"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseDLL_fixed|x64"> + <Configuration>ReleaseDLL_fixed</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="ReleaseDLL|Win32"> <Configuration>ReleaseDLL</Configuration> <Platform>Win32</Platform> @@ -35,79 +51,66 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\tests\opus_encode_regressions.c" /> <ClCompile Include="..\..\tests\test_opus_encode.c" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="celt.vcxproj"> - <Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project> - </ProjectReference> <ProjectReference Include="opus.vcxproj"> <Project>{219ec965-228a-1824-174d-96449d05f88a}</Project> </ProjectReference> - <ProjectReference Include="silk_common.vcxproj"> - <Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project> - </ProjectReference> - <ProjectReference Include="silk_float.vcxproj"> - <Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project> - </ProjectReference> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{84DAA768-1A38-4312-BB61-4C78BB59E5B8}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>test_opus_api</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -115,339 +118,54 @@ </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL_fixed|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="common.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> - <OutDir>$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <InlineFunctionExpansion>Disabled</InlineFunctionExpansion> - <OmitFramePointers>false</OmitFramePointers> - <StringPooling>false</StringPooling> - <SmallerTypeCheck>false</SmallerTypeCheck> - <ControlFlowGuard>Guard</ControlFlowGuard> - <FunctionLevelLinking>false</FunctionLevelLinking> - <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>true</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Fast</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalIncludeDirectories>..\..\silk;..\..\celt;..\;..\..\include;</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <DebugInformationFormat>None</DebugInformationFormat> - <CompileAsManaged>false</CompileAsManaged> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <OmitFramePointers>true</OmitFramePointers> - <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> - <StringPooling>true</StringPooling> - <ExceptionHandling>false</ExceptionHandling> - <StructMemberAlignment>16Bytes</StructMemberAlignment> - <BufferSecurityCheck>false</BufferSecurityCheck> - <ControlFlowGuard>false</ControlFlowGuard> - <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration> - <FloatingPointModel>Precise</FloatingPointModel> - <FloatingPointExceptions>false</FloatingPointExceptions> - <RuntimeTypeInfo>false</RuntimeTypeInfo> - <OpenMPSupport>false</OpenMPSupport> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> + <ItemDefinitionGroup /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/win32/VS2015/test_opus_encode.vcxproj.filters b/win32/VS2015/test_opus_encode.vcxproj.filters index 84ef4453..4ed3bb9e 100644 --- a/win32/VS2015/test_opus_encode.vcxproj.filters +++ b/win32/VS2015/test_opus_encode.vcxproj.filters @@ -10,5 +10,8 @@ <ClCompile Include="..\..\tests\test_opus_encode.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\tests\opus_encode_regressions.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/win32/genversion.bat b/win32/genversion.bat index cd1d4dce..1def7460 100644 --- a/win32/genversion.bat +++ b/win32/genversion.bat @@ -2,13 +2,13 @@ setlocal enableextensions enabledelayedexpansion -for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*"') do set version=%%v +for /f %%v in ('cd "%~dp0.." ^&^& git status ^>NUL 2^>NUL ^&^& git describe --tags --match "v*" --dirty 2^>NUL') do set version=%%v -if not "%version%"=="" goto :gotversion +if not "%version%"=="" set version=!version:~1! && goto :gotversion -if exist "%~dp0..\version.mk" goto :getversion +if exist "%~dp0..\package_version" goto :getversion -echo Git cannot be found, nor can version.mk. Generating unknown version. +echo Git cannot be found, nor can package_version. Generating unknown version. set version=unknown @@ -16,25 +16,16 @@ goto :gotversion :getversion -for /f "delims== tokens=2" %%v in (%~dps0..\version.mk) do set version=%%v - -set version=!version:^"=! -set version=!version: =! +for /f "delims== tokens=2" %%v in (%~dps0..\package_version) do set version=%%v +set version=!version:"=! :gotversion +set version=!version: =! set version_out=#define %~2 "%version%" -set version_mk=%~2 = "%version%" echo %version_out%> "%~1_temp" -if %version%==unknown goto :skipgenerate - -echo # static version string; update manually every release.> "%~dp0..\version.mk" -echo %version_mk%>> "%~dp0..\version.mk" - -:skipgenerate - echo n | comp "%~1_temp" "%~1" > NUL 2> NUL if not errorlevel 1 goto exit |