[gtk/msvcproj-demos: 5/7] build: Don't generate icon browser MSVC project




commit 3c3b7e183aec1645959082875122d20f15dee8b2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 27 18:28:19 2022 +0800

    build: Don't generate icon browser MSVC project
    
    The source listing is not likely to change for this one, so clean up the
    build files a bit, and make the gtk3-icon-browser MSVC project a
    complete one instead of a template.

 demos/icon-browser/Makefile.am                                 | 10 ----------
 win32/vs10/Makefile.am                                         |  6 ++----
 .../{gtk3-icon-browser.vcxprojin => gtk3-icon-browser.vcxproj} |  5 ++++-
 ...ser.vcxproj.filtersin => gtk3-icon-browser.vcxproj.filters} |  5 ++++-
 win32/vs9/Makefile.am                                          |  3 +--
 .../{gtk3-icon-browser.vcprojin => gtk3-icon-browser.vcproj}   |  5 ++++-
 6 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 9183b0170c..a969d72954 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -40,14 +40,4 @@ EXTRA_DIST = \
        icon.list \
        meson.build
 
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-icon-browser
-
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
-gtk3_icon_browser_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: $(top_builddir)/win32/vs9/gtk3-icon-browser.vcproj
-
 -include $(top_srcdir)/git.mk
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index ad9bede6ab..e0967aa30a 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-icon-browser.vcxproj               \
-       gtk3-icon-browser.vcxproj.filters       \
        gailutil-3.vcxproj                      \
        gailutil-3.vcxproj.filters
 
@@ -44,8 +42,8 @@ EXTRA_DIST += \
        gtk3-demo.vcxproj.filtersin             \
        gtk3-demo-application.vcxproj           \
        gtk3-demo-application.vcxproj.filters   \
-       gtk3-icon-browser.vcxprojin             \
-       gtk3-icon-browser.vcxproj.filtersin     \
+       gtk3-icon-browser.vcxproj               \
+       gtk3-icon-browser.vcxproj.filters       \
        gailutil-3.vcxprojin                    \
        gailutil-3.vcxproj.filtersin            \
        gtk3-install.vcxproj                    \
diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxproj
similarity index 95%
rename from win32/vs10/gtk3-icon-browser.vcxprojin
rename to win32/vs10/gtk3-icon-browser.vcxproj
index 6a0646426b..69eba5d6c7 100644
--- a/win32/vs10/gtk3-icon-browser.vcxprojin
+++ b/win32/vs10/gtk3-icon-browser.vcxproj
@@ -81,7 +81,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk3-icon-browser.vs10.sourcefiles"
+    <ClCompile Include="..\..\demos\icon-browser\main.c" />
+    <ClCompile Include="..\..\demos\icon-browser\iconbrowserapp.c" />
+    <ClCompile Include="..\..\demos\icon-browser\iconbrowserwin.c" />
+    <ClCompile Include="..\..\demos\icon-browser\iconstore.c" />
     <ClCompile Include="$(IntDir)\resources.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/win32/vs10/gtk3-icon-browser.vcxproj.filters
similarity index 66%
rename from win32/vs10/gtk3-icon-browser.vcxproj.filtersin
rename to win32/vs10/gtk3-icon-browser.vcxproj.filters
index 2063a07e95..a883ba47b2 100644
--- a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
+++ b/win32/vs10/gtk3-icon-browser.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk3-icon-browser.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\demos\icon-browser\main.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\demos\icon-browser\iconbrowserapp.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\demos\icon-browser\iconbrowserwin.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\demos\icon-browser\iconstore.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
index fd2332427c..063c579f89 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-icon-browser.vcproj        \
        gailutil-3.vcproj               \
        gtk3-version-paths.vsprops
 
@@ -24,7 +23,7 @@ EXTRA_DIST += \
        gtk-update-icon-cache.vcproj    \
        gtk3-demo.vcprojin              \
        gtk3-demo-application.vcproj    \
-       gtk3-icon-browser.vcprojin      \
+       gtk3-icon-browser.vcproj        \
        gailutil-3.vcprojin             \
        gtk3-install.vcproj             \
        gtk3-introspect.vcproj          \
diff --git a/win32/vs9/gtk3-icon-browser.vcprojin b/win32/vs9/gtk3-icon-browser.vcproj
similarity index 94%
rename from win32/vs9/gtk3-icon-browser.vcprojin
rename to win32/vs9/gtk3-icon-browser.vcproj
index 28c24358d6..f134b05071 100644
--- a/win32/vs9/gtk3-icon-browser.vcprojin
+++ b/win32/vs9/gtk3-icon-browser.vcproj
@@ -156,7 +156,10 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-#include "gtk3-icon-browser.sourcefiles"
+                       <File RelativePath="..\..\demos\icon-browser\main.c" />
+                       <File RelativePath="..\..\demos\icon-browser\iconbrowserapp.c" />
+                       <File RelativePath="..\..\demos\icon-browser\iconbrowserwin.c" />
+                       <File RelativePath="..\..\demos\icon-browser\iconstore.c" />
                        <File RelativePath=".\Release\$(PlatformName)\obj\gtk3-icon-browser\resources.c">
                                <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]