MSVC projects - accommodate some modules that recently got moved or removed

(mostly these got moved out of the PortAudio backend and into libpbd)

diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index dc425cc6a598c71688780955a1e51ae969f44357..67f102f712414d4fccd4d0927b00121e55fa85d2 100644 (file)
--- a/libs/ardour/MSVClibardour/ardour.vcproj
+++ b/libs/ardour/MSVClibardour/ardour.vcproj
@@ -459,10 +459,6 @@
                                RelativePath="..\diskstream.cc"
                                >
                        </File>
-                       <File
-                               RelativePath="..\dsp_load_calculator.cc"
-                               >
-                       </File>
                        <File
                                RelativePath="..\element_import_handler.cc"
                                >

diff --git a/libs/backends/MSVCbackends/portaudio_audiobackend.vcproj b/libs/backends/MSVCbackends/portaudio_audiobackend.vcproj
index 3607ab55a9fe9c40738462564dad0f1b933353ea..87d87505b4ded5d4b8efbb0557f9e38dcdc86b0b 100644 (file)
--- a/libs/backends/MSVCbackends/portaudio_audiobackend.vcproj
+++ b/libs/backends/MSVCbackends/portaudio_audiobackend.vcproj
@@ -272,10 +272,6 @@
                                RelativePath="..\portaudio\midi_util.cc"
                                >
                        </File>
-                       <File
-                               RelativePath="..\portaudio\mmcss.cc"
-                               >
-                       </File>
                        <File
                                RelativePath="..\portaudio\portaudio_backend.cc"
                                >
@@ -284,10 +280,6 @@
                                RelativePath="..\portaudio\portaudio_io.cc"
                                >
                        </File>
-                       <File
-                               RelativePath="..\portaudio\win_utils.cc"
-                               >
-                       </File>
                        <File
                                RelativePath="..\portaudio\winmmemidi_input_device.cc"
                                >
@@ -322,10 +314,6 @@
                                RelativePath="..\portaudio\midi_util.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\portaudio\mmcss.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\portaudio\portaudio_backend.h"
                                >
@@ -338,10 +326,6 @@
                                RelativePath="..\portaudio\rt_thread.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\portaudio\win_utils.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\portaudio\winmmemidi_input_device.h"
                                >

diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index e03b18aff28f79e1c0bcd63751188e584aaebbe6..b86cb97efad92ae1742387a6328bf8ef381be1ee 100644 (file)
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -62,7 +62,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix)D.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)D.lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix)D.lib $(DllPrefix)glib32$(GlibDllSuffix)D.lib $(DllPrefix)gobject32$(GlibDllSuffix)D.lib $(DllPrefix)sigc++32-2.0D.lib libxml2D.lib libsndfile-1D.lib intlD.lib ws2_32.lib dbghelp.lib"
+                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix)D.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)D.lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix)D.lib $(DllPrefix)glib32$(GlibDllSuffix)D.lib $(DllPrefix)gobject32$(GlibDllSuffix)D.lib $(DllPrefix)sigc++32-2.0D.lib libxml2D.lib libsndfile-1D.lib intlD.lib winmm.lib ws2_32.lib dbghelp.lib"
                                OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32D.dll"
                                AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
                                GenerateDebugInformation="true"
@@ -143,7 +143,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix).lib $(DllPrefix)glibmm32$(GlibmmDllSuffix).lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix).lib $(DllPrefix)glib32$(GlibDllSuffix).lib $(DllPrefix)gobject32$(GlibDllSuffix).lib $(DllPrefix)sigc++32-2.0.lib libxml2.lib libsndfile-1.lib intl.lib ws2_32.lib"
+                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix).lib $(DllPrefix)glibmm32$(GlibmmDllSuffix).lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix).lib $(DllPrefix)glib32$(GlibDllSuffix).lib $(DllPrefix)gobject32$(GlibDllSuffix).lib $(DllPrefix)sigc++32-2.0.lib libxml2.lib libsndfile-1.lib intl.lib winmm.lib ws2_32.lib"
                                OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32.dll"
                                AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
                                SubSystem="2"
@@ -225,7 +225,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)RDC.lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix)RDC.lib $(DllPrefix)glib32$(GlibDllSuffix)RDC.lib $(DllPrefix)gobject32$(GlibDllSuffix)RDC.lib $(DllPrefix)sigc++32-2.0RDC.lib libxml2RDC.lib libsndfile-1.lib intlRDC.lib ws2_32.lib"
+                               AdditionalDependencies="$(DllPrefix)giomm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)RDC.lib pthreadVCE2.lib $(DllPrefix)gio32$(GlibDllSuffix)RDC.lib $(DllPrefix)glib32$(GlibDllSuffix)RDC.lib $(DllPrefix)gobject32$(GlibDllSuffix)RDC.lib $(DllPrefix)sigc++32-2.0RDC.lib libxml2RDC.lib libsndfile-1.lib intlRDC.lib winmm.lib ws2_32.lib"
                                OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32RDC.dll"
                                AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
                                GenerateDebugInformation="true"
@@ -478,10 +478,18 @@
                                RelativePath="..\whitespace.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\windows_mmcss.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\windows_special_dirs.cc"
                                >
                        </File>
+                       <File
+                               RelativePath="..\windows_timer_utils.cc"
+                               >
+                       </File>
                        <File
                                RelativePath="..\xml++.cc"
                                >
@@ -812,10 +820,18 @@
                                RelativePath="..\pbd\unwind.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\pbd\windows_mmcss.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\pbd\windows_special_dirs.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\pbd\windows_timer_utils.h"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Resource Files"