From daf1d12c86850e96d44382494417e09ccd1eae3b Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Tue, 10 Jan 2017 00:48:49 +0000 Subject: VS2015: join common options in a properties file Should make the projects a bit easier to digest and the differences between the different configurations and platforms be more obvious. A (happy?) side effect of this is the static libraries are now about the same size as the ones produced by GCC and seem to build fine with opus-tools. Needs testing with other third party applications to make sure nothing is missing that shouldn't. Signed-off-by: Mark Harris --- win32/VS2015/common.props | 84 +++ win32/VS2015/opus.vcxproj | 1035 +++------------------------------ win32/VS2015/opus_demo.vcxproj | 500 +--------------- win32/VS2015/test_opus_api.vcxproj | 488 +--------------- win32/VS2015/test_opus_decode.vcxproj | 500 +--------------- win32/VS2015/test_opus_encode.vcxproj | 500 +--------------- 6 files changed, 204 insertions(+), 2903 deletions(-) create mode 100644 win32/VS2015/common.props (limited to 'win32') diff --git a/win32/VS2015/common.props b/win32/VS2015/common.props new file mode 100644 index 00000000..70789ef1 --- /dev/null +++ b/win32/VS2015/common.props @@ -0,0 +1,84 @@ + + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ + Unicode + + + true + true + false + + + false + false + true + + + + Level3 + false + false + ..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + FIXED_POINT;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) + false + false + + + Console + + + true + Console + + + + + Guard + ProgramDatabase + NoExtensions + false + true + false + Disabled + false + false + Disabled + MultiThreadedDebug + MultiThreadedDebugDLL + true + false + + + true + + + + + false + None + true + true + false + Speed + Fast + Precise + true + true + true + MaxSpeed + MultiThreaded + MultiThreadedDLL + 16Bytes + + + false + + + + \ No newline at end of file diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj index 9880ee56..0c1a40e1 100644 --- a/win32/VS2015/opus.vcxproj +++ b/win32/VS2015/opus.vcxproj @@ -54,755 +54,116 @@ Win32Proj opus {219EC965-228A-1824-174D-96449D05F88A} - 8.1 StaticLibrary - true v140 DynamicLibrary - true v140 DynamicLibrary - true v140 StaticLibrary - true v140 DynamicLibrary - true v140 DynamicLibrary - true v140 - false StaticLibrary - true v140 - false DynamicLibrary - true v140 - false DynamicLibrary - true v140 StaticLibrary - false v140 - true DynamicLibrary - false v140 - true DynamicLibrary - false v140 - true + + + + + + + + + + + + - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - false - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - Guard - false - false - true - false - false - false - NoExtensions - - - MachineX86 - true - Console - $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) - 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) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - Guard - false - false - true - false - false - false - NoExtensions - - - MachineX86 - true - Console - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - 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) - false - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - FIXED_POINT;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - Guard - false - false - true - false - false - false - NoExtensions - - - MachineX86 - true - Console - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - 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) - false - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - false - Guard - false - false - true - false - false - false - - - true - Console - $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) - 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) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - false - Guard - false - false - true - false - false - false - - - true - Console - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - 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) - false - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - FIXED_POINT;HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - 4996 - false - false - true - false - Disabled - false - false - Guard - false - false - true - false - false - false - - - true - Console - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - 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) - false - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - Windows - - - - - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreaded - Level3 - None - true - 4996 - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - true - Fast - false - false - false - - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - Level3 - None - true - 4996 - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - true - Precise - false - false - false - - - MachineX86 - false - Console - true - true - 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) - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - true - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - FIXED_POINT;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - Level3 - None - true - 4996 - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - true - Precise - false - false - false - - - MachineX86 - false - Console - true - true - 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) - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - true - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreaded - Level3 - None - 4996 - false - false - true - AnySuitable - true - Speed - true - true - true - false - 16Bytes - false - false - true - true - Fast - false - false - false - - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - Level3 - None - 4996 - false - false - true - AnySuitable - true - Speed - true - true - true - false - 16Bytes - false - false - true - true - Precise - false - false - false - - - false - Console - true - true - 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) - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - true - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - + - FIXED_POINT;HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;DLL_EXPORT;%(PreprocessorDefinitions) - ../..;../../silk/fixed;../../silk/float;../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - Level3 - None - 4996 - false - false - true - AnySuitable - true - Speed - true - true - true - false - 16Bytes - false - false - true - true - Precise - false - false - false + ..\..\silk\fixed;..\..\silk\float;%(AdditionalIncludeDirectories) - - false - Console - true - true - 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) - $(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - true - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION Generating version.h - - - - - - - - @@ -882,8 +243,7 @@ - 4146;%(DisableSpecificWarnings) - 4146;%(DisableSpecificWarnings) + 4146;%(DisableSpecificWarnings) @@ -924,422 +284,163 @@ - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - false - false - true - true - true - true - false - false + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true - true - true - true - true + true diff --git a/win32/VS2015/opus_demo.vcxproj b/win32/VS2015/opus_demo.vcxproj index b29c8fa6..f4344e53 100644 --- a/win32/VS2015/opus_demo.vcxproj +++ b/win32/VS2015/opus_demo.vcxproj @@ -62,85 +62,54 @@ {016C739D-6389-43BF-8D88-24B2BF6F620F} Win32Proj opus_demo - 8.1 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 @@ -148,497 +117,54 @@ + + + + + + + + + + + + - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - 4996 - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - 4996 - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - 4996 - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - 4996 - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - 4996 - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - 4996 - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - 4996 - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - 4996 - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - 4996 - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - 4996 - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - 4996 - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - true - None - false - false - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - 4996 - - - Console - true - true - - + diff --git a/win32/VS2015/test_opus_api.vcxproj b/win32/VS2015/test_opus_api.vcxproj index a4483820..7cae131b 100644 --- a/win32/VS2015/test_opus_api.vcxproj +++ b/win32/VS2015/test_opus_api.vcxproj @@ -62,85 +62,54 @@ {1D257A17-D254-42E5-82D6-1C87A6EC775A} Win32Proj test_opus_api - 8.1 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 @@ -148,485 +117,54 @@ + + + + + + + + + + + + - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - + diff --git a/win32/VS2015/test_opus_decode.vcxproj b/win32/VS2015/test_opus_decode.vcxproj index 3564f8ae..df01dca1 100644 --- a/win32/VS2015/test_opus_decode.vcxproj +++ b/win32/VS2015/test_opus_decode.vcxproj @@ -62,85 +62,54 @@ {8578322A-1883-486B-B6FA-E0094B65C9F2} Win32Proj test_opus_api - 8.1 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 @@ -148,497 +117,54 @@ + + + + + + + + + + + + - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - + diff --git a/win32/VS2015/test_opus_encode.vcxproj b/win32/VS2015/test_opus_encode.vcxproj index 41019c70..405efee9 100644 --- a/win32/VS2015/test_opus_encode.vcxproj +++ b/win32/VS2015/test_opus_encode.vcxproj @@ -63,85 +63,54 @@ {84DAA768-1A38-4312-BB61-4C78BB59E5B8} Win32Proj test_opus_api - 8.1 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 Application - false - true - Unicode v140 @@ -149,497 +118,54 @@ + + + + + + + + + + + + - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - Guard - false - false - NoExtensions - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebugDLL - 4996 - ProgramDatabase - false - false - true - false - Disabled - false - false - false - Guard - false - false - true - false - false - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Fast - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - ..\..\silk;..\..\celt;..\;..\..\include; - 4996 - None - false - false - true - AnySuitable - Speed - true - true - true - false - 16Bytes - false - false - true - Precise - false - false - false - - - Console - true - true - - + -- cgit v1.2.1