From 95091a52a0e5dc6c779457e358902598f4d3dd50 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 12 Jan 2015 14:43:22 +0000 Subject: When building with MSVC make sure any backends / panners etc get copied to the correct target folder (i.e. 'lib/ardour3' or 'lib/mixbus3' as appropriate) These changes are MSVC specific and shouldn't affect the other builds --- MSVCMixbus3/MSVCMixbus3.vsprops.in | 4 ++++ MSVCardour3/Ardour3.vcproj | 12 ++++++------ MSVCardour3/MSVCMixbus3.vsprops.in | 4 ++++ libs/backends/MSVCbackends/dummy_audiobackend.vcproj | 6 +++--- libs/backends/MSVCbackends/jack_audiobackend.vcproj | 6 +++--- libs/backends/MSVCbackends/waves_audiobackend.vcproj | 6 +++--- libs/panners/MSVCpanners/panner_1in2out.vcproj | 6 +++--- libs/panners/MSVCpanners/panner_2in2out.vcproj | 6 +++--- libs/panners/MSVCpanners/panner_vbap.vcproj | 6 +++--- .../MSVCreasonablesynth/reasonablesynth.vcproj | 6 +++--- .../MSVCardour_genericmidi/ardour_genericmidi.vcproj | 6 +++--- libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj | 6 +++--- libs/surfaces/osc/MSVCardour_osc/ardour_osc.vcproj | 6 +++--- 13 files changed, 44 insertions(+), 36 deletions(-) diff --git a/MSVCMixbus3/MSVCMixbus3.vsprops.in b/MSVCMixbus3/MSVCMixbus3.vsprops.in index fe5e65455a..c468868804 100644 --- a/MSVCMixbus3/MSVCMixbus3.vsprops.in +++ b/MSVCMixbus3/MSVCMixbus3.vsprops.in @@ -128,4 +128,8 @@ Name="TargetSxSFolder" Value="@TargetSxSFolder@" /> + diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj index 3f74de53bf..3f3562d547 100644 --- a/MSVCardour3/Ardour3.vcproj +++ b/MSVCardour3/Ardour3.vcproj @@ -19,7 +19,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets=".\MSVCMixbus3.vsprops" + InheritedPropertySheets="..\MSVCMixbus3\MSVCMixbus3.vsprops" UseOfMFC="0" > diff --git a/MSVCardour3/MSVCMixbus3.vsprops.in b/MSVCardour3/MSVCMixbus3.vsprops.in index fe5e65455a..c8f8cb7023 100644 --- a/MSVCardour3/MSVCMixbus3.vsprops.in +++ b/MSVCardour3/MSVCMixbus3.vsprops.in @@ -128,4 +128,8 @@ Name="TargetSxSFolder" Value="@TargetSxSFolder@" /> + diff --git a/libs/backends/MSVCbackends/dummy_audiobackend.vcproj b/libs/backends/MSVCbackends/dummy_audiobackend.vcproj index a9a18db6e9..ff839a0474 100644 --- a/libs/backends/MSVCbackends/dummy_audiobackend.vcproj +++ b/libs/backends/MSVCbackends/dummy_audiobackend.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/backends/MSVCbackends/jack_audiobackend.vcproj b/libs/backends/MSVCbackends/jack_audiobackend.vcproj index d5b81b2409..3b44ebfdce 100644 --- a/libs/backends/MSVCbackends/jack_audiobackend.vcproj +++ b/libs/backends/MSVCbackends/jack_audiobackend.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/backends/MSVCbackends/waves_audiobackend.vcproj b/libs/backends/MSVCbackends/waves_audiobackend.vcproj index 9e91f979c1..6321fa7735 100644 --- a/libs/backends/MSVCbackends/waves_audiobackend.vcproj +++ b/libs/backends/MSVCbackends/waves_audiobackend.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/panners/MSVCpanners/panner_1in2out.vcproj b/libs/panners/MSVCpanners/panner_1in2out.vcproj index 1b9a507f36..5c5f312e1f 100644 --- a/libs/panners/MSVCpanners/panner_1in2out.vcproj +++ b/libs/panners/MSVCpanners/panner_1in2out.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/panners/MSVCpanners/panner_2in2out.vcproj b/libs/panners/MSVCpanners/panner_2in2out.vcproj index bc43e848c7..27ddcb56d4 100644 --- a/libs/panners/MSVCpanners/panner_2in2out.vcproj +++ b/libs/panners/MSVCpanners/panner_2in2out.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/panners/MSVCpanners/panner_vbap.vcproj b/libs/panners/MSVCpanners/panner_vbap.vcproj index b3cb87c3cd..ac0327ac06 100644 --- a/libs/panners/MSVCpanners/panner_vbap.vcproj +++ b/libs/panners/MSVCpanners/panner_vbap.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/plugins/reasonablesynth.lv2/MSVCreasonablesynth/reasonablesynth.vcproj b/libs/plugins/reasonablesynth.lv2/MSVCreasonablesynth/reasonablesynth.vcproj index a966533e6b..f9a7e03987 100644 --- a/libs/plugins/reasonablesynth.lv2/MSVCreasonablesynth/reasonablesynth.vcproj +++ b/libs/plugins/reasonablesynth.lv2/MSVCreasonablesynth/reasonablesynth.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/surfaces/generic_midi/MSVCardour_genericmidi/ardour_genericmidi.vcproj b/libs/surfaces/generic_midi/MSVCardour_genericmidi/ardour_genericmidi.vcproj index c346852f19..f50ea3a947 100644 --- a/libs/surfaces/generic_midi/MSVCardour_genericmidi/ardour_genericmidi.vcproj +++ b/libs/surfaces/generic_midi/MSVCardour_genericmidi/ardour_genericmidi.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj b/libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj index ce1f7adfb1..5a1a153c97 100644 --- a/libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj +++ b/libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj @@ -91,7 +91,7 @@ /> diff --git a/libs/surfaces/osc/MSVCardour_osc/ardour_osc.vcproj b/libs/surfaces/osc/MSVCardour_osc/ardour_osc.vcproj index 7c32c0925d..921240e254 100644 --- a/libs/surfaces/osc/MSVCardour_osc/ardour_osc.vcproj +++ b/libs/surfaces/osc/MSVCardour_osc/ardour_osc.vcproj @@ -91,7 +91,7 @@ /> -- cgit v1.2.3