[gtk/more-vs-proj-updates] build: Do not generate gtk3-demo-application MSVC project

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

commit 9b759be3e1d54dde35c3a517be8fb07aed2fcc59
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 27 18:18:56 2022 +0800

    build: Do not generate gtk3-demo-application MSVC project
    
    Clean up build files a bit, as there is not much point using a
    'dist-hook' to generate the Visual Studio project file for this program.

 demos/gtk-demo/Makefile.am                                        | 8 ++------
 win32/vs10/Makefile.am                                            | 6 ++----
 ...3-demo-application.vcxprojin => gtk3-demo-application.vcxproj} | 2 +-
 ...on.vcxproj.filtersin => gtk3-demo-application.vcxproj.filters} | 2 +-
 win32/vs9/Makefile.am                                             | 3 +--
 ...tk3-demo-application.vcprojin => gtk3-demo-application.vcproj} | 2 +-
 6 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 06167986ef..6862a4bf88 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -115,19 +115,15 @@ uninstall-update-icon-cache:
        test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-demo gtk3-demo-application
+MSVCPROJS = gtk3-demo
 
 gtk3_demo_FILES = $(gtk3_demo_SOURCES)
 gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
 
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
-gtk3_demo_application_EXCLUDES = dummy
-
 include $(top_srcdir)/win32/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/win32/vs9/gtk3-demo.vcproj      \
-       $(top_builddir)/win32/vs9/gtk3-demo-application.vcproj
+       $(top_builddir)/win32/vs9/gtk3-demo.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32 demo_resources.c
 
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index b49bb752fe..ad9bede6ab 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -13,8 +13,6 @@ GENERATED_ITEMS = \
        gtk-3.vcxproj.filters                   \
        gtk3-demo.vcxproj                       \
        gtk3-demo.vcxproj.filters               \
-       gtk3-demo-application.vcxproj           \
-       gtk3-demo-application.vcxproj.filters   \
        gtk3-icon-browser.vcxproj               \
        gtk3-icon-browser.vcxproj.filters       \
        gailutil-3.vcxproj                      \
@@ -44,8 +42,8 @@ EXTRA_DIST += \
        gtk-update-icon-cache.vcxproj.filters   \
        gtk3-demo.vcxprojin                     \
        gtk3-demo.vcxproj.filtersin             \
-       gtk3-demo-application.vcxprojin         \
-       gtk3-demo-application.vcxproj.filtersin \
+       gtk3-demo-application.vcxproj           \
+       gtk3-demo-application.vcxproj.filters   \
        gtk3-icon-browser.vcxprojin             \
        gtk3-icon-browser.vcxproj.filtersin     \
        gailutil-3.vcxprojin                    \
diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxproj
similarity index 98%
rename from win32/vs10/gtk3-demo-application.vcxprojin
rename to win32/vs10/gtk3-demo-application.vcxproj
index d269c9f5d5..4e7a81e778 100644
--- a/win32/vs10/gtk3-demo-application.vcxprojin
+++ b/win32/vs10/gtk3-demo-application.vcxproj
@@ -78,7 +78,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk3-demo-application.vs10.sourcefiles"
+    <ClCompile Include="..\..\demos\gtk-demo\application.c" />
     <ClCompile Include=".\$(Configuration)\$(Platform)\obj\gtk3-demo\demo_resources.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/win32/vs10/gtk3-demo-application.vcxproj.filtersin 
b/win32/vs10/gtk3-demo-application.vcxproj.filters
similarity index 88%
rename from win32/vs10/gtk3-demo-application.vcxproj.filtersin
rename to win32/vs10/gtk3-demo-application.vcxproj.filters
index 5b356ef76b..86f3c356c3 100644
--- a/win32/vs10/gtk3-demo-application.vcxproj.filtersin
+++ b/win32/vs10/gtk3-demo-application.vcxproj.filters
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk3-demo-application.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\demos\gtk-demo\application.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
index f19e52c9f2..fd2332427c 100644
--- a/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -7,7 +7,6 @@ GENERATED_ITEMS = \
        gdk-3.vcproj                    \
        gtk-3.vcproj                    \
        gtk3-demo.vcproj                \
-       gtk3-demo-application.vcproj    \
        gtk3-icon-browser.vcproj        \
        gailutil-3.vcproj               \
        gtk3-version-paths.vsprops
@@ -24,7 +23,7 @@ EXTRA_DIST += \
        gtk-query-settings.vcproj       \
        gtk-update-icon-cache.vcproj    \
        gtk3-demo.vcprojin              \
-       gtk3-demo-application.vcprojin  \
+       gtk3-demo-application.vcproj    \
        gtk3-icon-browser.vcprojin      \
        gailutil-3.vcprojin             \
        gtk3-install.vcproj             \
diff --git a/win32/vs9/gtk3-demo-application.vcprojin b/win32/vs9/gtk3-demo-application.vcproj
similarity index 98%
rename from win32/vs9/gtk3-demo-application.vcprojin
rename to win32/vs9/gtk3-demo-application.vcproj
index 1866e967fe..6661fbc354 100644
--- a/win32/vs9/gtk3-demo-application.vcprojin
+++ b/win32/vs9/gtk3-demo-application.vcproj
@@ -152,7 +152,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-#include "gtk3-demo-application.sourcefiles"
+                       <File RelativePath="..\..\demos\gtk-demo\application.c" />
                        <File RelativePath=".\Release\$(PlatformName)\obj\gtk3-demo\demo_resources.c">
                                <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>