Process 'default_ui_config.in' when building with MSVC

diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj
index 07b960627ec5068b3c387c092669c5807226c164..28e478155b55c264eb01f02640f8f1fb4eab082a 100644 (file)
--- a/MSVCardour3/Ardour3.vcproj
+++ b/MSVCardour3/Ardour3.vcproj
@@ -24,6 +24,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Prepare configuration file(s)"
+                               CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -96,6 +98,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Debug32TestSuiteFolder)\..\share\ardour3&quot;&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
@@ -108,6 +111,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Prepare configuration file(s)"
+                               CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -177,7 +182,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="copy /Y &quot;$(Release32TestSuiteFolder)\$(ProjectName).exe&quot; &quot;$(Release32TargetFolder)\$(ProjectName).exe&quot;&#x0D;&#x0A;cd .&#x0D;&#x0A;"
+                               CommandLine="copy /Y &quot;$(Release32TestSuiteFolder)\$(ProjectName).exe&quot; &quot;$(Release32TargetFolder)\$(ProjectName).exe&quot;&#x0D;&#x0A;cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(PackagerFolderLocal)\..\share\ardour3&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\ardour3&quot;&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
@@ -190,6 +195,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Prepare configuration file(s)"
+                               CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -260,6 +267,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\ardour3&quot;&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>

diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index c99778f98fbbc677adcc83a12f44b80dd942bdf1..7befa60df45a762578f60c76e2864134db02018f 100644 (file)
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -24,6 +24,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Use existing configuration file(s)"
+                               CommandLine="cd ."
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -103,6 +105,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Use existing configuration file(s)"
+                               CommandLine="cd ."
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -182,7 +186,8 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="python &quot;../../../libs/pbd/pbd/signals.py&quot; &quot;../../../libs/pbd/pbd/signals_generated.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\ptw32\pthread.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\ptw32\pthread.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sys\targetsxs.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sys\targetsxs.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sys\time.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sys\time.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\float_cast.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\float_cast.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\libcharset.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\libcharset.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\localcharset.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\localcharset.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\misc.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\misc.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\pthread.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\pthread.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sched.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sched.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\semaphore.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\semaphore.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\unistd.h.input&quot; &quot;$(GenericIncludeFolder)\unistd.h&quot;&#x0D;&#x0A;"
+                               Description="Prepare configuration file(s)"
+                               CommandLine="python &quot;../../../libs/pbd/pbd/signals.py&quot; &quot;../../../libs/pbd/pbd/signals_generated.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\ptw32\pthread.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\ptw32\pthread.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sys\targetsxs.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sys\targetsxs.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sys\time.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sys\time.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\float_cast.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\float_cast.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\libcharset.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\libcharset.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\localcharset.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\localcharset.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\misc.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\misc.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\pthread.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\pthread.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\sched.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\sched.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\ardourext\semaphore.h.input&quot; &quot;$(GenericIncludeFolder)\ardourext\semaphore.h&quot;&#x0D;&#x0A;copy /Y &quot;..\..\..\msvc_extra_headers\unistd.h.input&quot; &quot;$(GenericIncludeFolder)\unistd.h&quot;&#x0D;&#x0A;cd ..\..\..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"

diff --git a/msvc32-fixup.pl b/msvc32-fixup.pl
index 7e8d4b239c1726b59410bdbad29fb0d9b34bce28..5448ed9c30039d956de3945ed4531017ccc66a73 100644 (file)
--- a/msvc32-fixup.pl
+++ b/msvc32-fixup.pl
@@ -18,6 +18,15 @@ $current_minus_age = 0;
 $exec_prefix = "lib";
 $dll_suffix = "32";
 $lib_ext = ".dll";
+$monospace = "ArdourMono";
+$font_small = 9;
+$font_smaller = 8;
+$font_normal = 10;
+$font_big = 14;
+$font_large = 18;
+$font_larger = 24;
+$font_huger = 34;
+$font_massive = 60;
 
 sub process_file
 {
@@ -47,6 +56,15 @@ sub process_file
            s/\@VERSION@/$msvc_mixbus_version/g;
            s/\@DLL_SUFFIX\@/$dll_suffix/g;
            s/\@LIB_EXT\@/$lib_ext/g;
+           s/\@MONOSPACE\@/$monospace/g;
+           s/\@FONT_SMALL\@/$font_small/g;
+           s/\@FONT_SMALLER\@/$font_smaller/g;
+           s/\@FONT_NORMAL\@/$font_normal/g;
+           s/\@FONT_BIG\@/$font_big/g;
+           s/\@FONT_LARGE\@/$font_large/g;
+           s/\@FONT_LARGER\@/$font_larger/g;
+           s/\@FONT_HUGER\@/$font_huger/g;
+           s/\@FONT_MASSIVE\@/$font_massive/g;
            s/\@GETTEXT_PACKAGE\@/$gettext_package/g;
            s/\@PERL_PATH@/$perl_path/g;
            s/\@PackagerFolderLocal@/$packager_folder_local/g;
@@ -74,6 +92,7 @@ sub process_file
 }
 
 process_file ("libs/plugins/reasonablesynth.lv2/manifest.ttl");
+process_file ("gtk2_ardour/default_ui_config");
 
 my $command=join(' ',@ARGV);
 if ($command eq -buildall) {