From 1975eeadd2bc0f80d60401093f25c167aff21a1f Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Wed, 26 Jun 2013 14:00:51 -0400 Subject: [PATCH] Big squashed commit of Garf's MSVC reorg: commit 77880655f652c54415e4b5f03b5984b951f5267b Author: Timothy B. Terriberry Date: Wed Jun 26 12:23:53 2013 +0200 Fix version.mk parsing in genversion.bat. This was broken by the changes in 0482c82f to make it work with spaces. CMD interprets the quotes to mean the argument to FOR is a string, not a file name. Instead, we expand the path to a short file name. Signed-off-by: Gian-Carlo Pascutto commit 8e97847ecac3a04956747b117fefef14939cbcbe Merge: 0482c82 3c0aa8f Author: Gian-Carlo Pascutto Date: Wed Jun 26 12:19:41 2013 +0200 Merge branch 'master' into msvc_reorg commit 0482c82fea6dd397a7d2ab50dc6cda4965278fc2 Author: Gian-Carlo Pascutto Date: Tue May 21 17:59:30 2013 +0200 Make genversion.bat work in paths with spaces. commit 3648ec55b7511119735280fc49bc57c7a3b55d6a Author: Gian-Carlo Pascutto Date: Tue May 21 17:42:14 2013 +0200 Rework output & intermediate dirs for parallel build support. commit c367a0fcfcbf5551fb65d61365d9b832d7af2b38 Merge: bafb1dd b518b56 Author: Gian-Carlo Pascutto Date: Tue May 21 14:17:11 2013 +0200 Merge branch 'master' into msvc_reorg Conflicts: win32/VS2010/celt.vcxproj win32/VS2010/opus.vcxproj win32/VS2010/silk_common.vcxproj win32/VS2010/silk_float.vcxproj commit bafb1dda3fcf6785decdfb42a1f934c7fab0c567 Author: Gian-Carlo Pascutto Date: Mon Mar 11 21:25:28 2013 +0100 Fix two more files to not have the Platform Toolset explicitly set. commit c69c870201fec7461862fe79731a37866a1810f1 Author: Gian-Carlo Pascutto Date: Mon Mar 11 21:08:00 2013 +0100 Add missing SILK MSVC project files. commit a0d41fb7f97558c8f812d500b9027c77907c37c0 Author: Gian-Carlo Pascutto Date: Fri Mar 8 15:00:51 2013 +0100 Use the default toolset in the MSVC project files. commit 34aac5b2637ed38c5620f0d876e08db232849933 Author: Gian-Carlo Pascutto Date: Fri Mar 8 14:54:41 2013 +0100 Move the MSVC project files outside the source tree. Bring the project structure more in line with the one in libogg. --- src/opus_demo.vcxproj | 101 --- src/opus_demo.vcxproj.filters | 75 --- tests/test_opus_api.vcxproj | 81 --- tests/test_opus_decode.vcxproj | 81 --- tests/test_opus_encode.vcxproj | 81 --- version.mk | 4 +- {celt => win32/VS2010}/celt.vcxproj | 494 +++++++------- {celt => win32/VS2010}/celt.vcxproj.filters | 309 +++++---- opus.sln => win32/VS2010/opus.sln | 270 ++++---- {src => win32/VS2010}/opus.vcxproj | 461 ++++++------- {src => win32/VS2010}/opus.vcxproj.filters | 81 +-- win32/VS2010/opus_demo.vcxproj | 156 +++++ .../VS2010/opus_demo.vcxproj.filters | 5 - {silk => win32/VS2010}/silk_common.vcxproj | 625 +++++++++--------- .../VS2010}/silk_common.vcxproj.filters | 484 +++++++------- .../fixed => win32/VS2010}/silk_fixed.vcxproj | 382 +++++------ .../VS2010}/silk_fixed.vcxproj.filters | 154 ++--- .../float => win32/VS2010}/silk_float.vcxproj | 495 +++++++------- .../VS2010}/silk_float.vcxproj.filters | 196 +++--- win32/VS2010/test_opus_api.vcxproj | 157 +++++ win32/VS2010/test_opus_api.vcxproj.filters | 14 + win32/VS2010/test_opus_decode.vcxproj | 157 +++++ .../VS2010}/test_opus_decode.vcxproj.filters | 2 +- win32/VS2010/test_opus_encode.vcxproj | 157 +++++ .../VS2010}/test_opus_encode.vcxproj.filters | 2 +- win32/genversion.bat | 12 +- 26 files changed, 2660 insertions(+), 2376 deletions(-) delete mode 100644 src/opus_demo.vcxproj delete mode 100644 src/opus_demo.vcxproj.filters delete mode 100644 tests/test_opus_api.vcxproj delete mode 100644 tests/test_opus_decode.vcxproj delete mode 100644 tests/test_opus_encode.vcxproj rename {celt => win32/VS2010}/celt.vcxproj (67%) rename {celt => win32/VS2010}/celt.vcxproj.filters (55%) rename opus.sln => win32/VS2010/opus.sln (78%) rename {src => win32/VS2010}/opus.vcxproj (82%) rename {src => win32/VS2010}/opus.vcxproj.filters (82%) create mode 100644 win32/VS2010/opus_demo.vcxproj rename tests/test_opus_api.vcxproj.filters => win32/VS2010/opus_demo.vcxproj.filters (86%) rename {silk => win32/VS2010}/silk_common.vcxproj (61%) rename {silk => win32/VS2010}/silk_common.vcxproj.filters (63%) rename {silk/fixed => win32/VS2010}/silk_fixed.vcxproj (72%) rename {silk/fixed => win32/VS2010}/silk_fixed.vcxproj.filters (63%) rename {silk/float => win32/VS2010}/silk_float.vcxproj (73%) rename {silk/float => win32/VS2010}/silk_float.vcxproj.filters (60%) create mode 100644 win32/VS2010/test_opus_api.vcxproj create mode 100644 win32/VS2010/test_opus_api.vcxproj.filters create mode 100644 win32/VS2010/test_opus_decode.vcxproj rename {tests => win32/VS2010}/test_opus_decode.vcxproj.filters (88%) create mode 100644 win32/VS2010/test_opus_encode.vcxproj rename {tests => win32/VS2010}/test_opus_encode.vcxproj.filters (88%) diff --git a/src/opus_demo.vcxproj b/src/opus_demo.vcxproj deleted file mode 100644 index 24d61b8b..00000000 --- a/src/opus_demo.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - {016C739D-6389-43BF-8D88-24B2BF6F620F} - Win32Proj - opus_demo - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include; - MultiThreadedDebug - - - Console - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ../silk;../celt;../win32;../include; - true - - - Console - true - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - - diff --git a/src/opus_demo.vcxproj.filters b/src/opus_demo.vcxproj.filters deleted file mode 100644 index 3e1ef57e..00000000 --- a/src/opus_demo.vcxproj.filters +++ /dev/null @@ -1,75 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/tests/test_opus_api.vcxproj b/tests/test_opus_api.vcxproj deleted file mode 100644 index 656230cf..00000000 --- a/tests/test_opus_api.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - {1D257A17-D254-42E5-82D6-1C87A6EC775A} - Win32Proj - test_opus_api - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include; - MultiThreadedDebug - - - Console - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ../silk;../celt;../win32;../include; - - - Console - true - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - - diff --git a/tests/test_opus_decode.vcxproj b/tests/test_opus_decode.vcxproj deleted file mode 100644 index cd122418..00000000 --- a/tests/test_opus_decode.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - {8578322A-1883-486B-B6FA-E0094B65C9F2} - Win32Proj - test_opus_api - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include; - MultiThreadedDebug - - - Console - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ../silk;../celt;../win32;../include; - - - Console - true - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - - diff --git a/tests/test_opus_encode.vcxproj b/tests/test_opus_encode.vcxproj deleted file mode 100644 index 87a98493..00000000 --- a/tests/test_opus_encode.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - {84DAA768-1A38-4312-BB61-4C78BB59E5B8} - Win32Proj - test_opus_api - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include; - MultiThreadedDebug - - - Console - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - ../silk;../celt;../win32;../include; - - - Console - true - true - $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) - - - - - - diff --git a/version.mk b/version.mk index 1ff62d61..15f6ae43 100644 --- a/version.mk +++ b/version.mk @@ -1,2 +1,2 @@ -# static version string; update manually before and afer every release. -OPUS_VERSION = "1.1-alpha" +# static version string; update manually every release. +PACKAGE_VERSION = "v1.1-alpha-115-gc367a0f" diff --git a/celt/celt.vcxproj b/win32/VS2010/celt.vcxproj similarity index 67% rename from celt/celt.vcxproj rename to win32/VS2010/celt.vcxproj index 47066ff4..f107fec0 100644 --- a/celt/celt.vcxproj +++ b/win32/VS2010/celt.vcxproj @@ -1,239 +1,255 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {245603E3-F580-41A5-9632-B25FE3372CBF} - Win32Proj - celt - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32;../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32;../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../win32;../include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - true - true - true - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../win32;../include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - true - true - true - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {245603E3-F580-41A5-9632-B25FE3372CBF} + Win32Proj + celt + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + $(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;_LIB;%(PreprocessorDefinitions) + ..\;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\;..\..\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\;..\..\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + \ No newline at end of file diff --git a/celt/celt.vcxproj.filters b/win32/VS2010/celt.vcxproj.filters similarity index 55% rename from celt/celt.vcxproj.filters rename to win32/VS2010/celt.vcxproj.filters index 6de09545..e3a1d977 100644 --- a/celt/celt.vcxproj.filters +++ b/win32/VS2010/celt.vcxproj.filters @@ -1,147 +1,162 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/opus.sln b/win32/VS2010/opus.sln similarity index 78% rename from opus.sln rename to win32/VS2010/opus.sln index 93b38c31..2a03f94d 100644 --- a/opus.sln +++ b/win32/VS2010/opus.sln @@ -1,140 +1,130 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_common", "silk\silk_common.vcxproj", "{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}" - ProjectSection(ProjectDependencies) = postProject - {245603E3-F580-41A5-9632-B25FE3372CBF} = {245603E3-F580-41A5-9632-B25FE3372CBF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "src\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}") = "silk_fixed", "silk\fixed\silk_fixed.vcxproj", "{8484C90D-1561-402F-A91D-2DB10F8C5171}" - ProjectSection(ProjectDependencies) = postProject - {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\silk_float.vcxproj", "{9C4961D2-5DDB-40C7-9BE8-CA918DC4E782}" - ProjectSection(ProjectDependencies) = postProject - {8484C90D-1561-402F-A91D-2DB10F8C5171} = {8484C90D-1561-402F-A91D-2DB10F8C5171} - {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\celt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus_demo", "src\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", "tests\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", "tests\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", "tests\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 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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}.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 - {219EC965-228A-1824-174D-96449D05F88A}.Debug|Win32.ActiveCfg = Debug|Win32 - {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}.Release|Win32.ActiveCfg = Release|Win32 - {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 - {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}.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 - {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}.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 - {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}.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 - {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|Win32 - {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|Win32.ActiveCfg = Release|Win32 - {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|Win32.Build.0 = Release|Win32 - {016C739D-6389-43BF-8D88-24B2BF6F620F}.Release|x64.ActiveCfg = Release|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|Win32.ActiveCfg = Debug|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|Win32.Build.0 = Debug|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|x64.ActiveCfg = Debug|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|Win32.ActiveCfg = Release|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|Win32.Build.0 = Release|Win32 - {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Release|x64.ActiveCfg = Release|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|Win32.Build.0 = Debug|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|x64.ActiveCfg = Debug|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|Win32.ActiveCfg = Release|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|Win32.Build.0 = Release|Win32 - {8578322A-1883-486B-B6FA-E0094B65C9F2}.Release|x64.ActiveCfg = Release|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|Win32.ActiveCfg = Debug|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|Win32.Build.0 = Debug|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|x64.ActiveCfg = Debug|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|Win32.ActiveCfg = Release|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|Win32.Build.0 = Release|Win32 - {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "opus.vcxproj", "{219EC965-228A-1824-174D-96449D05F88A}" +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 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {219EC965-228A-1824-174D-96449D05F88A}.Debug|Win32.ActiveCfg = Debug|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {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 + {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}.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 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {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 + {1D257A17-D254-42E5-82D6-1C87A6EC775A}.Debug|Win32.ActiveCfg = Debug|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {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 + {8578322A-1883-486B-B6FA-E0094B65C9F2}.Debug|Win32.ActiveCfg = Debug|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {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 + {84DAA768-1A38-4312-BB61-4C78BB59E5B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {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 + {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}.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 + {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}.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 + {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}.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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/opus.vcxproj b/win32/VS2010/opus.vcxproj similarity index 82% rename from src/opus.vcxproj rename to win32/VS2010/opus.vcxproj index c7612117..607ff1f2 100644 --- a/src/opus.vcxproj +++ b/win32/VS2010/opus.vcxproj @@ -1,226 +1,235 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Win32Proj - opus - {219EC965-228A-1824-174D-96449D05F88A} - - - - StaticLibrary - true - - - StaticLibrary - true - - - false - StaticLibrary - true - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Level3 - ProgramDatabase - Disabled - - - 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 - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Level3 - ProgramDatabase - Disabled - - - 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 - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include;%(AdditionalIncludeDirectories) - MultiThreaded - Level3 - ProgramDatabase - true - - - MachineX86 - false - Console - true - true - 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) - $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) - false - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../silk;../celt;../win32;../include;%(AdditionalIncludeDirectories) - MultiThreaded - Level3 - ProgramDatabase - - - false - Console - true - true - 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) - $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) - false - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + opus + {219EC965-228A-1824-174D-96449D05F88A} + + + + StaticLibrary + true + + + StaticLibrary + true + + + false + StaticLibrary + true + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + true + $(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + true + $(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;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Level3 + ProgramDatabase + Disabled + + + 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 + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Level3 + ProgramDatabase + Disabled + + + 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 + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) + MultiThreaded + Level3 + ProgramDatabase + true + + + MachineX86 + false + Console + true + true + 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) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) + MultiThreaded + Level3 + ProgramDatabase + + + false + Console + true + true + 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) + $(SolutionDir)$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories) + false + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/opus.vcxproj.filters b/win32/VS2010/opus.vcxproj.filters similarity index 82% rename from src/opus.vcxproj.filters rename to win32/VS2010/opus.vcxproj.filters index 4ae8930a..c3b95b86 100644 --- a/src/opus.vcxproj.filters +++ b/win32/VS2010/opus.vcxproj.filters @@ -15,44 +15,6 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - Header Files @@ -86,14 +48,55 @@ Header Files + + Header Files + Header Files Header Files + + Header Files + Header Files - + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2010/opus_demo.vcxproj b/win32/VS2010/opus_demo.vcxproj new file mode 100644 index 00000000..9cc081f1 --- /dev/null +++ b/win32/VS2010/opus_demo.vcxproj @@ -0,0 +1,156 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {016C739D-6389-43BF-8D88-24B2BF6F620F} + Win32Proj + opus_demo + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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;../win32;../include; + MultiThreadedDebug + + + Console + true + $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../silk;../celt;../win32;../include; + MultiThreadedDebug + + + Console + true + $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ../silk;../celt;../win32;../include; + true + + + Console + true + true + $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ../silk;../celt;../win32;../include; + true + + + Console + true + true + $(SolutionDir)$(Configuration)\opus.lib;$(SolutionDir)$(Configuration)\celt.lib;$(SolutionDir)$(Configuration)\silk_common.lib;$(SolutionDir)$(Configuration)\silk_float.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/tests/test_opus_api.vcxproj.filters b/win32/VS2010/opus_demo.vcxproj.filters similarity index 86% rename from tests/test_opus_api.vcxproj.filters rename to win32/VS2010/opus_demo.vcxproj.filters index 66498da7..d7ef6a1a 100644 --- a/tests/test_opus_api.vcxproj.filters +++ b/win32/VS2010/opus_demo.vcxproj.filters @@ -14,9 +14,4 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - Source Files - - \ No newline at end of file diff --git a/silk/silk_common.vcxproj b/win32/VS2010/silk_common.vcxproj similarity index 61% rename from silk/silk_common.vcxproj rename to win32/VS2010/silk_common.vcxproj index 1b20c6c9..275f1097 100644 --- a/silk/silk_common.vcxproj +++ b/win32/VS2010/silk_common.vcxproj @@ -1,307 +1,318 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} - Win32Proj - src_common - silk_common - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - fixed;float;../win32;../celt;../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - fixed;float;../win32;../celt;../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - fixed;float;../win32;../celt;../include - MultiThreaded - Fast - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - fixed;float;../win32;../celt;../include - MultiThreaded - Fast - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\win32\genversion.bat" "$(ProjectDir)..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} + Win32Proj + src_common + silk_common + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk/float;../../win32;../../celt;../../include + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk/float;../../win32;../../celt;../../include + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk/float;../../win32;../../celt;../../include + MultiThreaded + Fast + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk/float;../../win32;../../celt;../../include + MultiThreaded + Fast + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/silk/silk_common.vcxproj.filters b/win32/VS2010/silk_common.vcxproj.filters similarity index 63% rename from silk/silk_common.vcxproj.filters rename to win32/VS2010/silk_common.vcxproj.filters index 318123ae..17616125 100644 --- a/silk/silk_common.vcxproj.filters +++ b/win32/VS2010/silk_common.vcxproj.filters @@ -15,242 +15,18 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - + + Header Files + Header Files Header Files + + Header Files + Header Files @@ -287,6 +63,12 @@ Header Files + + Header Files + + + Header Files + Header Files @@ -299,17 +81,235 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/silk/fixed/silk_fixed.vcxproj b/win32/VS2010/silk_fixed.vcxproj similarity index 72% rename from silk/fixed/silk_fixed.vcxproj rename to win32/VS2010/silk_fixed.vcxproj index 5c94b30c..3d0e0fca 100644 --- a/silk/fixed/silk_fixed.vcxproj +++ b/win32/VS2010/silk_fixed.vcxproj @@ -1,186 +1,198 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8484C90D-1561-402F-A91D-2DB10F8C5171} - Win32Proj - src_FIX - silk_fixed - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../;../../win32;../../celt;../../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../;../../win32;../../celt;../../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - Level3 - - - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../;../../win32;../../celt;../../include - MultiThreaded - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../;../../win32;../../celt;../../include - MultiThreaded - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8484C90D-1561-402F-A91D-2DB10F8C5171} + Win32Proj + src_FIX + silk_fixed + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreaded + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreaded + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/silk/fixed/silk_fixed.vcxproj.filters b/win32/VS2010/silk_fixed.vcxproj.filters similarity index 63% rename from silk/fixed/silk_fixed.vcxproj.filters rename to win32/VS2010/silk_fixed.vcxproj.filters index 7f67bcd2..68979303 100644 --- a/silk/fixed/silk_fixed.vcxproj.filters +++ b/win32/VS2010/silk_fixed.vcxproj.filters @@ -14,83 +14,6 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - Header Files @@ -108,4 +31,81 @@ Header Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/silk/float/silk_float.vcxproj b/win32/VS2010/silk_float.vcxproj similarity index 73% rename from silk/float/silk_float.vcxproj rename to win32/VS2010/silk_float.vcxproj index 4a69ef75..ec788d1f 100644 --- a/silk/float/silk_float.vcxproj +++ b/win32/VS2010/silk_float.vcxproj @@ -1,242 +1,253 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} - Win32Proj - src_FLP - silk_float - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - Compile - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../;../fixed;../../win32;../../celt;../../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - Level3 - Disabled - HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../;../fixed;../../win32;../../celt;../../include - MultiThreadedDebug - - - Windows - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - true - true - HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../;../fixed;../../win32;../../celt;../../include - MultiThreaded - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - Level3 - - - MaxSpeed - true - true - HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../;../fixed;../../win32;../../celt;../../include - MultiThreaded - - - Windows - true - true - true - - - $(OutDir)$(TargetName)$(TargetExt) - - - "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION - Generating version.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9C4961D2-5DDB-40C7-9BE8-CA918DC4E782} + Win32Proj + src_FLP + silk_float + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + Compile + $(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreadedDebug + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreaded + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 + MultiThreaded + + + Windows + true + true + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + "$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION + Generating version.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/silk/float/silk_float.vcxproj.filters b/win32/VS2010/silk_float.vcxproj.filters similarity index 60% rename from silk/float/silk_float.vcxproj.filters rename to win32/VS2010/silk_float.vcxproj.filters index dbec9655..a7088b2f 100644 --- a/silk/float/silk_float.vcxproj.filters +++ b/win32/VS2010/silk_float.vcxproj.filters @@ -15,101 +15,9 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - + + Header Files + Header Files @@ -122,8 +30,100 @@ Header Files - - Header Files - + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/win32/VS2010/test_opus_api.vcxproj b/win32/VS2010/test_opus_api.vcxproj new file mode 100644 index 00000000..bf42a8fa --- /dev/null +++ b/win32/VS2010/test_opus_api.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + {1D257A17-D254-42E5-82D6-1C87A6EC775A} + Win32Proj + test_opus_api + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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 + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\silk;..\..\celt;..\;..\..\include; + MultiThreadedDebug + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + \ No newline at end of file diff --git a/win32/VS2010/test_opus_api.vcxproj.filters b/win32/VS2010/test_opus_api.vcxproj.filters new file mode 100644 index 00000000..383d19f7 --- /dev/null +++ b/win32/VS2010/test_opus_api.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2010/test_opus_decode.vcxproj b/win32/VS2010/test_opus_decode.vcxproj new file mode 100644 index 00000000..19d69731 --- /dev/null +++ b/win32/VS2010/test_opus_decode.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + {8578322A-1883-486B-B6FA-E0094B65C9F2} + Win32Proj + test_opus_api + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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 + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\silk;..\..\celt;..\;..\..\include; + MultiThreadedDebug + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + \ No newline at end of file diff --git a/tests/test_opus_decode.vcxproj.filters b/win32/VS2010/test_opus_decode.vcxproj.filters similarity index 88% rename from tests/test_opus_decode.vcxproj.filters rename to win32/VS2010/test_opus_decode.vcxproj.filters index 595c6d44..3036a4e7 100644 --- a/tests/test_opus_decode.vcxproj.filters +++ b/win32/VS2010/test_opus_decode.vcxproj.filters @@ -7,7 +7,7 @@ - + Source Files diff --git a/win32/VS2010/test_opus_encode.vcxproj b/win32/VS2010/test_opus_encode.vcxproj new file mode 100644 index 00000000..65ba35a4 --- /dev/null +++ b/win32/VS2010/test_opus_encode.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + {84DAA768-1A38-4312-BB61-4C78BB59E5B8} + Win32Proj + test_opus_api + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + $(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 + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\silk;..\..\celt;..\;..\..\include; + MultiThreadedDebug + + + Console + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + Level3 + + + MaxSpeed + true + true + HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + ..\..\silk;..\..\celt;..\;..\..\include; + + + Console + true + true + $(Platform)\$(Configuration)\opus.lib;$(Platform)\$(Configuration)\celt.lib;$(Platform)\$(Configuration)\silk_common.lib;$(Platform)\$(Configuration)\silk_float.lib + + + + + + \ No newline at end of file diff --git a/tests/test_opus_encode.vcxproj.filters b/win32/VS2010/test_opus_encode.vcxproj.filters similarity index 88% rename from tests/test_opus_encode.vcxproj.filters rename to win32/VS2010/test_opus_encode.vcxproj.filters index 9ec23556..84ef4453 100644 --- a/tests/test_opus_encode.vcxproj.filters +++ b/win32/VS2010/test_opus_encode.vcxproj.filters @@ -7,7 +7,7 @@ - + Source Files diff --git a/win32/genversion.bat b/win32/genversion.bat index 7934ebfa..82885be7 100644 --- a/win32/genversion.bat +++ b/win32/genversion.bat @@ -2,7 +2,7 @@ setlocal enableextensions enabledelayedexpansion -for /f %%v in ('git describe --tags --match "v*"') do set version=%%v +for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*"') do set version=%%v if not "%version%"=="" goto :gotversion @@ -16,7 +16,7 @@ goto :gotversion :getversion -for /f "delims== tokens=2" %%v in (%~dp0..\version.mk) do set version=%%v +for /f "delims== tokens=2" %%v in (%~dps0..\version.mk) do set version=%%v set version=!version:^"=! set version=!version: =! @@ -26,7 +26,7 @@ set version=!version: =! set version_out=#define %2 "%version%" set version_mk=%2 = "%version%" -echo %version_out%> %1_temp +echo %version_out%> "%1_temp" if %version%==unknown goto :skipgenerate @@ -35,12 +35,12 @@ echo %version_mk%>> "%~dp0..\version.mk" :skipgenerate -echo n | comp %1_temp %1 > NUL 2> NUL +echo n | comp "%1_temp" "%1" > NUL 2> NUL if not errorlevel 1 goto exit -copy /y %1_temp %1 +copy /y "%1_temp" "%1" :exit -del %1_temp +del "%1_temp" \ No newline at end of file