Following my last change we can now give 'MSVCArdour3.vsprops.in' its correct name

This change is MSVC specific and shouldn't affect the other builds

diff --git a/MSVCardour3/MSVCArdour3.vsprops.in b/MSVCardour3/MSVCArdour3.vsprops.in
new file mode 100644 (file)
index 0000000..c8f8cb7
--- /dev/null
+++ b/MSVCardour3/MSVCArdour3.vsprops.in
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="MSVCMixbus3"
+       >
+       <UserMacro
+               Name="GlibApiVersion"
+               Value="@GLIB_API_VERSION@"
+       />
+       <UserMacro
+               Name="GdkPixbufApiVersion"
+               Value="@GDK_PIXBUF_API_VERSION@"
+       />
+       <UserMacro
+               Name="DllPrefix"
+               Value="lib"
+       />
+       <UserMacro
+               Name="DllSuffix"
+               Value="@DLL_SUFFIX@"
+       />
+       <UserMacro
+               Name="GlibDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="AtkDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="CairoDllSuffix"
+               Value="-2"
+       />
+       <UserMacro
+               Name="PangoDllSuffix"
+               Value="-1.0-0"
+       />
+       <UserMacro
+               Name="GtkDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="GdkPixbufDllSuffix"
+               Value="-@GDK_PIXBUF_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
+       />
+       <UserMacro
+               Name="GlibmmDllSuffix"
+               Value="-2.4-0"
+       />
+       <UserMacro
+               Name="AtkmmDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="CairommDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="PangommDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="GtkmmDllSuffix"
+               Value="-2.0-0"
+       />
+       <UserMacro
+               Name="GtkBuildProjectFolder"
+               Value="@GtkBuildProjectFolder@"
+       />
+       <UserMacro
+               Name="GlibBuildRootFolder"
+               Value="@GlibBuildRootFolder@"
+       />
+       <UserMacro
+               Name="GdkPixbufBuildRootFolder"
+               Value="@GdkPixbufBuildRootFolder@"
+       />
+       <UserMacro
+               Name="JackBuildRootFolder"
+               Value="@JackBuildRootFolder@"
+       />
+       <UserMacro
+               Name="GenericIncludeFolder"
+               Value="@GenericIncludeFolder@"
+       />
+       <UserMacro
+               Name="GenericLibraryFolder"
+               Value="@GenericLibraryFolder@"
+       />
+       <UserMacro
+               Name="GenericWin32LibraryFolder"
+               Value="@GenericWin32LibraryFolder@"
+       />
+       <UserMacro
+               Name="GenericWin32BinaryFolder"
+               Value="@GenericWin32BinaryFolder@"
+       />
+       <UserMacro
+               Name="PackagerFolderLocal"
+               Value="@PackagerFolderLocal@"
+       />
+       <UserMacro
+               Name="Debug32TestSuiteFolder"
+               Value="@Debug32TestSuiteFolder@"
+       />
+       <UserMacro
+               Name="Release32TestSuiteFolder"
+               Value="@Release32TestSuiteFolder@"
+       />
+       <UserMacro
+               Name="Debug32TargetFolder"
+               Value="@Debug32TargetFolder@"
+       />
+       <UserMacro
+               Name="Release32TargetFolder"
+               Value="@Release32TargetFolder@"
+       />
+       <UserMacro
+               Name="Debug32PixbufLoadersFolder"
+               Value="@Debug32PixbufLoadersFolder@"
+       />
+       <UserMacro
+               Name="Release32PixbufLoadersFolder"
+               Value="@Release32PixbufLoadersFolder@"
+       />
+       <UserMacro
+               Name="TargetSxSFolder"
+               Value="@TargetSxSFolder@"
+       />
+       <UserMacro
+               Name="LibardourFolder"
+               Value="ardour3"
+       />
+</VisualStudioPropertySheet>

diff --git a/MSVCardour3/MSVCMixbus3.vsprops.in b/MSVCardour3/MSVCMixbus3.vsprops.in
deleted file mode 100644 (file)
index c8f8cb7..0000000
--- a/MSVCardour3/MSVCMixbus3.vsprops.in
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="MSVCMixbus3"
-       >
-       <UserMacro
-               Name="GlibApiVersion"
-               Value="@GLIB_API_VERSION@"
-       />
-       <UserMacro
-               Name="GdkPixbufApiVersion"
-               Value="@GDK_PIXBUF_API_VERSION@"
-       />
-       <UserMacro
-               Name="DllPrefix"
-               Value="lib"
-       />
-       <UserMacro
-               Name="DllSuffix"
-               Value="@DLL_SUFFIX@"
-       />
-       <UserMacro
-               Name="GlibDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="AtkDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="CairoDllSuffix"
-               Value="-2"
-       />
-       <UserMacro
-               Name="PangoDllSuffix"
-               Value="-1.0-0"
-       />
-       <UserMacro
-               Name="GtkDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="GdkPixbufDllSuffix"
-               Value="-@GDK_PIXBUF_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
-       />
-       <UserMacro
-               Name="GlibmmDllSuffix"
-               Value="-2.4-0"
-       />
-       <UserMacro
-               Name="AtkmmDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="CairommDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="PangommDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="GtkmmDllSuffix"
-               Value="-2.0-0"
-       />
-       <UserMacro
-               Name="GtkBuildProjectFolder"
-               Value="@GtkBuildProjectFolder@"
-       />
-       <UserMacro
-               Name="GlibBuildRootFolder"
-               Value="@GlibBuildRootFolder@"
-       />
-       <UserMacro
-               Name="GdkPixbufBuildRootFolder"
-               Value="@GdkPixbufBuildRootFolder@"
-       />
-       <UserMacro
-               Name="JackBuildRootFolder"
-               Value="@JackBuildRootFolder@"
-       />
-       <UserMacro
-               Name="GenericIncludeFolder"
-               Value="@GenericIncludeFolder@"
-       />
-       <UserMacro
-               Name="GenericLibraryFolder"
-               Value="@GenericLibraryFolder@"
-       />
-       <UserMacro
-               Name="GenericWin32LibraryFolder"
-               Value="@GenericWin32LibraryFolder@"
-       />
-       <UserMacro
-               Name="GenericWin32BinaryFolder"
-               Value="@GenericWin32BinaryFolder@"
-       />
-       <UserMacro
-               Name="PackagerFolderLocal"
-               Value="@PackagerFolderLocal@"
-       />
-       <UserMacro
-               Name="Debug32TestSuiteFolder"
-               Value="@Debug32TestSuiteFolder@"
-       />
-       <UserMacro
-               Name="Release32TestSuiteFolder"
-               Value="@Release32TestSuiteFolder@"
-       />
-       <UserMacro
-               Name="Debug32TargetFolder"
-               Value="@Debug32TargetFolder@"
-       />
-       <UserMacro
-               Name="Release32TargetFolder"
-               Value="@Release32TargetFolder@"
-       />
-       <UserMacro
-               Name="Debug32PixbufLoadersFolder"
-               Value="@Debug32PixbufLoadersFolder@"
-       />
-       <UserMacro
-               Name="Release32PixbufLoadersFolder"
-               Value="@Release32PixbufLoadersFolder@"
-       />
-       <UserMacro
-               Name="TargetSxSFolder"
-               Value="@TargetSxSFolder@"
-       />
-       <UserMacro
-               Name="LibardourFolder"
-               Value="ardour3"
-       />
-</VisualStudioPropertySheet>

diff --git a/msvc32-fixup.pl b/msvc32-fixup.pl
index 5448ed9c30039d956de3945ed4531017ccc66a73..c72a689889d3d163a111b95ba11d4d62b2888e0c 100644 (file)
--- a/msvc32-fixup.pl
+++ b/msvc32-fixup.pl
@@ -96,7 +96,7 @@ process_file ("gtk2_ardour/default_ui_config");
 
 my $command=join(' ',@ARGV);
 if ($command eq -buildall) {
-       process_file ("MSVCardour3/MSVCMixbus3.vsprops");
+       process_file ("MSVCardour3/MSVCArdour3.vsprops");
        process_file ("MSVCMixbus3/MSVCMixbus3.vsprops");
        process_file ("MSVCvst_scan/vst_scan.rc");
        process_file ("icons/win32/msvc_resources.rc");