From 8bb3e18ffbb2e67cf14b0737019290b5d97d4cde Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 11 Feb 2021 13:46:59 +0000 Subject: [PATCH] Update project so that it builds from the dotnet dir --- .hgignore | 8 +- dotnet/rubberband-dll.vcxproj | 11 +- .../rubberband-library.vcxproj | 116 +++++++++--------- rubberband.sln => dotnet/rubberband.sln | 30 ++--- 4 files changed, 80 insertions(+), 85 deletions(-) rename {otherbuilds => dotnet}/rubberband-library.vcxproj (66%) rename rubberband.sln => dotnet/rubberband.sln (75%) diff --git a/.hgignore b/.hgignore index 7c0b5fe..a10ed24 100644 --- a/.hgignore +++ b/.hgignore @@ -18,10 +18,10 @@ doc/html *.rej cov-int *~ -re:^x64/Debug/ -re:^x64/Release/ -re:^Release/ -re:^Debug/ +x64/Debug/ +x64/Release/ +Release/ +Debug/ build build_* UpgradeLog* diff --git a/dotnet/rubberband-dll.vcxproj b/dotnet/rubberband-dll.vcxproj index c641bcf..fbe8b31 100644 --- a/dotnet/rubberband-dll.vcxproj +++ b/dotnet/rubberband-dll.vcxproj @@ -22,32 +22,33 @@ {32C11C5C-3D27-4E57-B72C-161A48AAA95E} rubberbanddll Win32Proj + 10.0 DynamicLibrary false - v140 + v142 true Unicode DynamicLibrary false - v140 + v142 true Unicode DynamicLibrary true - v140 + v142 Unicode DynamicLibrary true - v140 + v142 Unicode @@ -151,7 +152,7 @@ true NDEBUG;RUBBERBANDDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - $(SolutionDir)rubberband;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\rubberband;%(AdditionalIncludeDirectories) Windows diff --git a/otherbuilds/rubberband-library.vcxproj b/dotnet/rubberband-library.vcxproj similarity index 66% rename from otherbuilds/rubberband-library.vcxproj rename to dotnet/rubberband-library.vcxproj index 823f714..4aa1ce8 100644 --- a/otherbuilds/rubberband-library.vcxproj +++ b/dotnet/rubberband-library.vcxproj @@ -22,23 +22,24 @@ {020CEB11-EF4E-400E-971D-A35DB69D7CF9} rubberband-library Win32Proj + 10.0 StaticLibrary - v140 + v142 StaticLibrary - v140 + v142 StaticLibrary - v140 + v142 StaticLibrary - v140 + v142 @@ -63,6 +64,7 @@ Debug\ Debug\ true + $(SourcePath) true @@ -74,7 +76,7 @@ Disabled - .;.\src;%(AdditionalIncludeDirectories) + .;..\src;%(AdditionalIncludeDirectories) __MSVC__;WIN32;_DEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;USE_SPEEX;%(PreprocessorDefinitions) true EnableFastChecks @@ -88,7 +90,7 @@ Disabled - .;.\src;%(AdditionalIncludeDirectories) + .;..\src;%(AdditionalIncludeDirectories) __MSVC__;WIN32;_DEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;USE_SPEEX;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,7 +108,7 @@ true Speed true - .;.\src;%(AdditionalIncludeDirectories) + .;..\src;%(AdditionalIncludeDirectories) __MSVC__;WIN32;NDEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;NO_TIMING;USE_SPEEX;NO_THREAD_CHECKS;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -124,7 +126,7 @@ true Speed true - .;.\src;%(AdditionalIncludeDirectories) + ..;..\src;%(AdditionalIncludeDirectories) __MSVC__;WIN32;NDEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;NO_TIMING;USE_SPEEX;NO_THREAD_CHECKS;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -137,57 +139,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/rubberband.sln b/dotnet/rubberband.sln similarity index 75% rename from rubberband.sln rename to dotnet/rubberband.sln index eeb002f..52d3187 100644 --- a/rubberband.sln +++ b/dotnet/rubberband.sln @@ -1,15 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-library", "rubberband-library.vcxproj", "{020CEB11-EF4E-400E-971D-A35DB69D7CF9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-program", "rubberband-program.vcxproj", "{06838307-FEAA-4DB0-8E08-AF19698E9C40}" - ProjectSection(ProjectDependencies) = postProject - {020CEB11-EF4E-400E-971D-A35DB69D7CF9} = {020CEB11-EF4E-400E-971D-A35DB69D7CF9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-dll", "rubberband-dll.vcxproj", "{32C11C5C-3D27-4E57-B72C-161A48AAA95E}" ProjectSection(ProjectDependencies) = postProject {020CEB11-EF4E-400E-971D-A35DB69D7CF9} = {020CEB11-EF4E-400E-971D-A35DB69D7CF9} @@ -30,32 +25,26 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.ActiveCfg = Debug|x64 + {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.Build.0 = Debug|x64 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x64.ActiveCfg = Debug|x64 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x64.Build.0 = Debug|x64 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x86.ActiveCfg = Debug|Win32 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x86.Build.0 = Debug|Win32 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|Any CPU.ActiveCfg = Release|Win32 + {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|Any CPU.Build.0 = Release|Win32 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x64.ActiveCfg = Release|x64 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x64.Build.0 = Release|x64 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x86.ActiveCfg = Release|Win32 {020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x86.Build.0 = Release|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x64.ActiveCfg = Debug|x64 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x64.Build.0 = Debug|x64 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x86.ActiveCfg = Debug|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x86.Build.0 = Debug|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|Any CPU.ActiveCfg = Release|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x64.ActiveCfg = Release|x64 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x64.Build.0 = Release|x64 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x86.ActiveCfg = Release|Win32 - {06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x86.Build.0 = Release|Win32 - {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.Build.0 = Debug|x64 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x64.ActiveCfg = Debug|x64 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x64.Build.0 = Debug|x64 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x86.ActiveCfg = Debug|Win32 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x86.Build.0 = Debug|Win32 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|Any CPU.ActiveCfg = Release|Win32 + {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|Any CPU.Build.0 = Release|Win32 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x64.ActiveCfg = Release|x64 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x64.Build.0 = Release|x64 {32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x86.ActiveCfg = Release|Win32 @@ -76,4 +65,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3CFE825B-BD44-4909-B002-AFE8DA45D614} + EndGlobalSection EndGlobal