[gtk/gtk-3-24] MSVC projects: Fix demos build

[Chun-wei Fan <fanchunwei src gnome org>]

commit 2b9493429bf4c4e294cea70795098ff6261bba38
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jul 29 12:34:49 2019 +0800

    MSVC projects: Fix demos build
    
    I forgot to include the copying of demos.h.win32 to demos.h step, so the
    demos could not be properly built from the projects.  Fix that.
    
    Also fix the command line where we generate gtkdbusgenerated.[c|h] which
    was accidentally changed.

 build/win32/generate-msvc.mak          | 10 +++++++---
 build/win32/vs10/gtk3-gen-srcs.props   |  6 +++++-
 build/win32/vs10/gtk3-prebuild.vcxproj |  2 +-
 build/win32/vs9/gtk3-gen-srcs.vsprops  |  4 ++++
 build/win32/vs9/gtk3-prebuild.vcproj   | 16 ++++++++--------
 5 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak
index 99a61a6459..10b39b6256 100644
--- a/build/win32/generate-msvc.mak
+++ b/build/win32/generate-msvc.mak
@@ -44,10 +44,12 @@ all:        \
        ..\..\gdk\gdkmarshalers.h       \
        ..\..\gdk\gdkmarshalers.c       \
        ..\..\gdk\gdkresources.h        \
-       ..\..\gdk\gdkresources.c
+       ..\..\gdk\gdkresources.c        \
+       ..\..\demos\gtk-demo\demos.h
 
-# Copy the pre-defined config.h.win32
+# Copy the pre-defined config.h.win32 and demos.h.win32
 ..\..\config.h: ..\..\config.h.win32
+..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32
 
 ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE)
        @if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del 
..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
@@ -58,7 +60,8 @@ all:  \
 ..\..\gdk\gdkconfig.h: ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
 
 ..\..\config.h \
-..\..\gdk\gdkconfig.h:
+..\..\gdk\gdkconfig.h  \
+..\..\demos\gtk-demo\demos.h:
        @copy $** $@
 
 ..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in
@@ -88,6 +91,7 @@ all:  \
 
 # Remove the generated files
 clean:
+       @-del /f /q ..\..\demos\gtk-demo\demos.h
        @-del /f /q ..\..\gdk\gdkresources.c
        @-del /f /q ..\..\gdk\gdkresources.h
        @-del /f /q ..\..\gdk\gdk.gresource.xml
diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props
index 726207f164..ca9414a26f 100644
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk3-gen-srcs.props
@@ -8,7 +8,8 @@
 set VCInstallDir=$(VCInstallDir)
 nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
     
<GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
-    <GDbusCodeGenCmd>c:\vs$(VSVer).0\$(Platform)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace 
_Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
+    <GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
+    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk 
--generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
     <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd 
$(SolutionDir)</GenerateGtkDbusBuiltSources>
     <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
     <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var 
--input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest 
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
@@ -31,6 +32,9 @@ del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
     <BuildMacro Include="GeneratedGdkSources">
       <Value>$(GeneratedGdkSources)</Value>
     </BuildMacro>
+    <BuildMacro Include="GeneratedDemoSources">
+      <Value>$(GeneratedDemoSources)</Value>
+    </BuildMacro>
     <BuildMacro Include="GDbusCodeGenCmd">
       <Value>$(GDbusCodeGenCmd)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/build/win32/vs10/gtk3-prebuild.vcxproj
index 197beeb481..60615a340d 100644
--- a/build/win32/vs10/gtk3-prebuild.vcxproj
+++ b/build/win32/vs10/gtk3-prebuild.vcxproj
@@ -133,7 +133,7 @@
     <NMakeCleanCommandLine Condition="'$(Configuration)' == 
'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) 
clean</NMakeCleanCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) 
CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) 
CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GeneratedGdkSources)</NMakeOutput>
+    <NMakeOutput>$(GeneratedGdkSources);$(GeneratedDemoSources)</NMakeOutput>
   </PropertyGroup>
   <ItemGroup>
   </ItemGroup>
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops
index 6f2b0a12f2..c4e84ddd3c 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk3-gen-srcs.vsprops
@@ -13,6 +13,10 @@
                Name="GeneratedGdkSources"
                
Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
        />
+       <UserMacro
+               Name="GeneratedDemoSources"
+               Value="..\..\..\demos\gtk-demo\demos.h"
+       />
        <UserMacro
                Name="GDbusCodeGenCmd"
                Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk 
--generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/build/win32/vs9/gtk3-prebuild.vcproj
index 39dee06ff3..0946dfac88 100644
--- a/build/win32/vs9/gtk3-prebuild.vcproj
+++ b/build/win32/vs9/gtk3-prebuild.vcproj
@@ -31,7 +31,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -46,7 +46,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -61,7 +61,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -76,7 +76,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -92,7 +92,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -108,7 +108,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -124,7 +124,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
                <Configuration
@@ -140,7 +140,7 @@
                                BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam)"
                                ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam) clean all"
                                CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 
$(IntrospectPythonParam) clean"
-                               Output="$(GeneratedGdkSources)"
+                               Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
                        />
                </Configuration>
        </Configurations>