[gtk/more-vs-proj-updates] generate-msvc.mak: Support generating libgtk/gailutil projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/more-vs-proj-updates] generate-msvc.mak: Support generating libgtk/gailutil projects
- Date: Thu, 4 Aug 2022 08:45:49 +0000 (UTC)
commit 597e3d56e117feb6623cce5f8c193f331847b855
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 4 16:26:35 2022 +0800
generate-msvc.mak: Support generating libgtk/gailutil projects
This adds rules to allow (re-)generating the libgtk and libgail-util Visual
Studio projects, which needed some tinkering since we don't want to fall into
the nasty U1095 error.
win32/config-msvc.mak.in | 163 ++++++++++++++++++++++++++++++++
win32/create-lists-msvc.mak | 47 ++++++++-
win32/generate-msvc.mak | 226 ++++++++++++++++++++------------------------
3 files changed, 307 insertions(+), 129 deletions(-)
---
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index bd810f13e2..74abc4196d 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -157,21 +157,184 @@ GTK3_VS17_STATIC_PROJS = $(GTK3_VS10_STATIC_PROJS:vs10\=vs17\)
GDK_VS9_PROJ = gdk-3.vcproj
GDKWIN32_VS9_PROJ = gdk3-win32.vcproj
GDKBROADWAY_VS9_PROJ = $(GDKWIN32_VS9_PROJ:-win32=-broadway)
+GTK_VS9_PROJ = gtk-3.vcproj
+GAILUTIL_VS9_PROJ = gailutil-3.vcproj
BROADWAYD_VS9_PROJ = broadwayd.vcproj
DEMO_VS9_PROJ = gtk3-demo.vcproj
GDK_VS1X_PROJ = $(GDK_VS9_PROJ:.vcproj=.vcxproj)
GDKWIN32_VS1X_PROJ = $(GDKWIN32_VS9_PROJ:.vcproj=.vcxproj)
GDKBROADWAY_VS1X_PROJ = $(GDKBROADWAY_VS9_PROJ:.vcproj=.vcxproj)
+GTK_VS1X_PROJ = $(GTK_VS9_PROJ:.vcproj=.vcxproj)
+GAILUTIL_VS1X_PROJ = $(GAILUTIL_VS9_PROJ:.vcproj=.vcxproj)
BROADWAYD_VS1X_PROJ = $(BROADWAYD_VS9_PROJ:.vcproj=.vcxproj)
DEMO_VS1X_PROJ = $(DEMO_VS9_PROJ:.vcproj=.vcxproj)
GDK_VS1X_PROJ_FILTERS = $(GDK_VS9_PROJ:.vcproj=.vcxproj.filters)
GDKWIN32_VS1X_PROJ_FILTERS = $(GDKWIN32_VS9_PROJ:.vcproj=.vcxproj.filters)
GDKBROADWAY_VS1X_PROJ_FILTERS = $(GDKBROADWAY_VS9_PROJ:.vcproj=.vcxproj.filters)
+GTK_VS1X_PROJ_FILTERS = $(GTK_VS9_PROJ:.vcproj=.vcxproj.filters)
+GAILUTIL_VS1X_PROJ_FILTERS = $(GAILUTIL_VS9_PROJ:.vcproj=.vcxproj.filters)
BROADWAYD_VS1X_PROJ_FILTERS = $(BROADWAYD_VS9_PROJ:.vcproj=.vcxproj.filters)
DEMO_VS1X_PROJ_FILTERS = $(DEMO_VS9_PROJ:.vcproj=.vcxproj.filters)
+GTK3_GDK_VC1X_PROJS = \
+ vs10\$(GDK_VS1X_PROJ) \
+ vs11\$(GDK_VS1X_PROJ) \
+ vs12\$(GDK_VS1X_PROJ) \
+ vs14\$(GDK_VS1X_PROJ) \
+ vs15\$(GDK_VS1X_PROJ) \
+ vs16\$(GDK_VS1X_PROJ) \
+ vs17\$(GDK_VS1X_PROJ)
+
+GTK3_GDK_VC1X_PROJ_FILTERS = \
+ vs11\$(GDK_VS1X_PROJ_FILTERS) \
+ vs12\$(GDK_VS1X_PROJ_FILTERS) \
+ vs14\$(GDK_VS1X_PROJ_FILTERS) \
+ vs15\$(GDK_VS1X_PROJ_FILTERS) \
+ vs16\$(GDK_VS1X_PROJ_FILTERS) \
+ vs17\$(GDK_VS1X_PROJ_FILTERS)
+
+GTK3_GDK_WIN32_VC1X_PROJS = \
+ vs10\$(GDKWIN32_VS1X_PROJ) \
+ vs11\$(GDKWIN32_VS1X_PROJ) \
+ vs12\$(GDKWIN32_VS1X_PROJ) \
+ vs14\$(GDKWIN32_VS1X_PROJ) \
+ vs15\$(GDKWIN32_VS1X_PROJ) \
+ vs16\$(GDKWIN32_VS1X_PROJ) \
+ vs17\$(GDKWIN32_VS1X_PROJ)
+
+GTK3_GDK_WIN32_VC1X_PROJ_FILTERS = \
+ vs11\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+ vs12\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+ vs14\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+ vs15\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+ vs16\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+ vs17\$(GDKWIN32_VS1X_PROJ_FILTERS)
+
+GTK3_GDK_BROADWAY_VC1X_PROJS = \
+ vs10\$(GDKBROADWAY_VS1X_PROJ) \
+ vs11\$(GDKBROADWAY_VS1X_PROJ) \
+ vs12\$(GDKBROADWAY_VS1X_PROJ) \
+ vs14\$(GDKBROADWAY_VS1X_PROJ) \
+ vs15\$(GDKBROADWAY_VS1X_PROJ) \
+ vs16\$(GDKBROADWAY_VS1X_PROJ) \
+ vs17\$(GDKBROADWAY_VS1X_PROJ)
+
+GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS = \
+ vs11\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+ vs12\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+ vs14\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+ vs15\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+ vs16\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+ vs17\$(GDKBROADWAY_VS1X_PROJ_FILTERS)
+
+GTK3_GTK_VC1X_PROJS = \
+ vs10\$(GTK_VS1X_PROJ) \
+ vs11\$(GTK_VS1X_PROJ) \
+ vs12\$(GTK_VS1X_PROJ) \
+ vs14\$(GTK_VS1X_PROJ) \
+ vs15\$(GTK_VS1X_PROJ) \
+ vs16\$(GTK_VS1X_PROJ) \
+ vs17\$(GTK_VS1X_PROJ)
+
+GTK3_GTK_VC1X_PROJ_FILTERS = \
+ vs11\$(GTK_VS1X_PROJ_FILTERS) \
+ vs12\$(GTK_VS1X_PROJ_FILTERS) \
+ vs14\$(GTK_VS1X_PROJ_FILTERS) \
+ vs15\$(GTK_VS1X_PROJ_FILTERS) \
+ vs16\$(GTK_VS1X_PROJ_FILTERS) \
+ vs17\$(GTK_VS1X_PROJ_FILTERS)
+
+GTK3_GAILUTIL_VC1X_PROJS = \
+ vs10\$(GAILUTIL_VS1X_PROJ) \
+ vs11\$(GAILUTIL_VS1X_PROJ) \
+ vs12\$(GAILUTIL_VS1X_PROJ) \
+ vs14\$(GAILUTIL_VS1X_PROJ) \
+ vs15\$(GAILUTIL_VS1X_PROJ) \
+ vs16\$(GAILUTIL_VS1X_PROJ) \
+ vs17\$(GAILUTIL_VS1X_PROJ)
+
+GTK3_GAILUTIL_VC1X_PROJ_FILTERS = \
+ vs11\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+ vs12\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+ vs14\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+ vs15\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+ vs16\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+ vs17\$(GAILUTIL_VS1X_PROJ_FILTERS)
+
+GTK3_BROADWAYD_VC1X_PROJS = \
+ vs10\$(BROADWAYD_VS1X_PROJ) \
+ vs11\$(BROADWAYD_VS1X_PROJ) \
+ vs12\$(BROADWAYD_VS1X_PROJ) \
+ vs14\$(BROADWAYD_VS1X_PROJ) \
+ vs15\$(BROADWAYD_VS1X_PROJ) \
+ vs16\$(BROADWAYD_VS1X_PROJ) \
+ vs17\$(BROADWAYD_VS1X_PROJ)
+
+GTK3_BROADWAYD_VC1X_PROJ_FILTERS = \
+ vs11\$(BROADWAYD_VS1X_PROJ_FILTERS) \
+ vs12\$(BROADWAYD_VS1X_PROJ_FILTERS) \
+ vs14\$(BROADWAYD_VS1X_PROJ_FILTERS) \
+ vs15\$(BROADWAYD_VS1X_PROJ_FILTERS) \
+ vs16\$(BROADWAYD_VS1X_PROJ_FILTERS) \
+ vs17\$(BROADWAYD_VS1X_PROJ_FILTERS)
+
+GTK3_DEMO_VC1X_PROJS = \
+ vs10\$(DEMO_VS1X_PROJ) \
+ vs11\$(DEMO_VS1X_PROJ) \
+ vs12\$(DEMO_VS1X_PROJ) \
+ vs14\$(DEMO_VS1X_PROJ) \
+ vs15\$(DEMO_VS1X_PROJ) \
+ vs16\$(DEMO_VS1X_PROJ) \
+ vs17\$(DEMO_VS1X_PROJ)
+
+GTK3_DEMO_VC1X_PROJ_FILTERS = \
+ vs11\$(DEMO_VS1X_PROJ_FILTERS) \
+ vs12\$(DEMO_VS1X_PROJ_FILTERS) \
+ vs14\$(DEMO_VS1X_PROJ_FILTERS) \
+ vs15\$(DEMO_VS1X_PROJ_FILTERS) \
+ vs16\$(DEMO_VS1X_PROJ_FILTERS) \
+ vs17\$(DEMO_VS1X_PROJ_FILTERS)
+
+GTK3_GDK_WIN32_VCPROJS = \
+ vs9\$(GDKWIN32_VS9_PROJ) \
+ $(GTK3_GDK_WIN32_VC1X_PROJS) \
+ $(GTK3_GDK_WIN32_VC1X_PROJ_FILTERS)
+
+GTK3_GDK_BROADWAY_VCPROJS = \
+ vs9\$(GDKBROADWAY_VS9_PROJ) \
+ $(GTK3_GDK_BROADWAY_VC1X_PROJS) \
+ $(GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS)
+
+GTK3_BROADWAYD_VCPROJS = \
+ vs9\$(BROADWAYD_VS9_PROJ) \
+ $(GTK3_BROADWAYD_VC1X_PROJS) \
+ $(GTK3_BROADWAYD_VC1X_PROJ_FILTERS)
+
+GTK3_GDK_VCPROJS = \
+ vs9\$(GDK_VS9_PROJ) \
+ $(GTK3_GDK_VC1X_PROJS) \
+ $(GTK3_GDK_VC1X_PROJ_FILTERS) \
+ $(GTK3_GDK_WIN32_VCPROJS) \
+ $(GTK3_GDK_BROADWAY_VCPROJS) \
+ $(GTK3_BROADWAYD_VCPROJS)
+
+GTK3_GTK_VCPROJS = \
+ vs9\$(GTK_VS9_PROJ) \
+ $(GTK3_GTK_VC1X_PROJS) \
+ $(GTK3_GTK_VC1X_PROJ_FILTERS)
+
+GTK3_GAILUTIL_VCPROJS = \
+ vs9\$(GAILUTIL_VS9_PROJ) \
+ $(GTK3_GAILUTIL_VC1X_PROJS) \
+ $(GTK3_GAILUTIL_VC1X_PROJ_FILTERS)
+
+GTK3_DEMO_VCPROJS = \
+ vs9\$(DEMO_VS9_PROJ) \
+ $(GTK3_DEMO_VC1X_PROJS) \
+ $(GTK3_DEMO_VC1X_PROJ_FILTERS)
+
DEMO_DEP_LIBS_NEW_PANGO=harfbuzz.lib
DEMO_DEP_LIBS_PANGOFT2_VS1X=pangoft2-1.0.lib;harfbuzz.lib;freetype.lib
DEMO_DEP_LIBS_PANGOFT2_VS9=$(DEMO_DEP_LIBS_PANGOFT2_VS1X:;= )
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
index 50ca29202d..f678e36d7e 100644
--- a/win32/create-lists-msvc.mak
+++ b/win32/create-lists-msvc.mak
@@ -130,6 +130,9 @@ NULL=
!include ..\gtk\deprecated\Makefile.inc
!include ..\gtk\inspector\Makefile.inc
+# For the libgail-util public headers
+!include ..\libgail-util\libgail-util-sources.inc
+
!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_PUBLIC_ENUM_HEADERS]
!endif
@@ -160,32 +163,68 @@ NULL=
!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
!endif
-!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_C_SRCS]
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_MISC_C_SRCS]
!endif
!if [for %f in ($(a11y_c_sources) $(gtk_deprecated_c_sources) $(inspector_c_sources)) do @call
create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f]
!endif
+!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_C_SRCS_A_H]
+!endif
+
!if [for %f in ($(gtk_base_c_sources_base_gtka_gtkh:.c=)) do @call create-lists.bat file
gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f.c]
!endif
+!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_C_SRCS_I_W]
+!endif
+
!if [for %f in ($(gtk_base_c_sources_base_gtki_gtkw:.c=)) do @call create-lists.bat file
gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f.c]
!endif
+!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_OS_WIN32_C_SRCS]
+!endif
+
!if [for %f in ($(gtk_os_win32_c_sources)) do @call create-lists.bat file
gtk_sources_msvc$(VSVER)_$(PLAT).mak ../gtk/%f]
!endif
!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
!endif
+!if [echo GTK_C_SRCS = ^$(GTK_MISC_C_SRCS) ^$(GTK_C_SRCS_A_H) ^$(GTK_C_SRCS_I_W)
^$(GTK_OS_WIN32_C_SRCS)>>gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GTK_MORE_C_SRCS]
+!endif
+
+!if [for %f in ($(gtk_use_win32_c_sources) $(gtk_clipboard_dnd_c_sources_generic)) do @call create-lists.bat
file gtk_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources_msvc$(VSVER)_$(PLAT).mak GAILUTIL_C_SRCS]
+!endif
+
+!if [for %f in ($(util_c_sources)) do @call create-lists.bat file gtk_sources_msvc$(VSVER)_$(PLAT).mak
..\libgail-util\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources_msvc$(VSVER)_$(PLAT).mak]
+!endif
+
!include gtk_sources_msvc$(VSVER)_$(PLAT).mak
!if [del /f /q gtk_sources_msvc$(VSVER)_$(PLAT).mak]
!endif
-# For the libgail-util public headers
-!include ..\libgail-util\libgail-util-sources.inc
-
# For GTK resources
!if [for %f in ($(adwaita_theme_css_sources:/=\)) do @call create-lists.bat file
resource_sources_msvc$(VSVER)_$(PLAT).mak ..\gtk\%f]
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index dbe87d9d6a..384a0a8c83 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -58,119 +58,6 @@ GTK_GENERATED_SOURCES = \
.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c \
$(GTK_VERSION_H)
-GTK3_GDK_VC1X_PROJS = \
- vs10\$(GDK_VS1X_PROJ) \
- vs11\$(GDK_VS1X_PROJ) \
- vs12\$(GDK_VS1X_PROJ) \
- vs14\$(GDK_VS1X_PROJ) \
- vs15\$(GDK_VS1X_PROJ) \
- vs16\$(GDK_VS1X_PROJ) \
- vs17\$(GDK_VS1X_PROJ)
-
-GTK3_GDK_VC1X_PROJ_FILTERS = \
- vs11\$(GDK_VS1X_PROJ_FILTERS) \
- vs12\$(GDK_VS1X_PROJ_FILTERS) \
- vs14\$(GDK_VS1X_PROJ_FILTERS) \
- vs15\$(GDK_VS1X_PROJ_FILTERS) \
- vs16\$(GDK_VS1X_PROJ_FILTERS) \
- vs17\$(GDK_VS1X_PROJ_FILTERS)
-
-GTK3_GDK_WIN32_VC1X_PROJS = \
- vs10\$(GDKWIN32_VS1X_PROJ) \
- vs11\$(GDKWIN32_VS1X_PROJ) \
- vs12\$(GDKWIN32_VS1X_PROJ) \
- vs14\$(GDKWIN32_VS1X_PROJ) \
- vs15\$(GDKWIN32_VS1X_PROJ) \
- vs16\$(GDKWIN32_VS1X_PROJ) \
- vs17\$(GDKWIN32_VS1X_PROJ)
-
-GTK3_GDK_WIN32_VC1X_PROJ_FILTERS = \
- vs11\$(GDKWIN32_VS1X_PROJ_FILTERS) \
- vs12\$(GDKWIN32_VS1X_PROJ_FILTERS) \
- vs14\$(GDKWIN32_VS1X_PROJ_FILTERS) \
- vs15\$(GDKWIN32_VS1X_PROJ_FILTERS) \
- vs16\$(GDKWIN32_VS1X_PROJ_FILTERS) \
- vs17\$(GDKWIN32_VS1X_PROJ_FILTERS)
-
-GTK3_GDK_BROADWAY_VC1X_PROJS = \
- vs10\$(GDKBROADWAY_VS1X_PROJ) \
- vs11\$(GDKBROADWAY_VS1X_PROJ) \
- vs12\$(GDKBROADWAY_VS1X_PROJ) \
- vs14\$(GDKBROADWAY_VS1X_PROJ) \
- vs15\$(GDKBROADWAY_VS1X_PROJ) \
- vs16\$(GDKBROADWAY_VS1X_PROJ) \
- vs17\$(GDKBROADWAY_VS1X_PROJ)
-
-GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS = \
- vs11\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
- vs12\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
- vs14\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
- vs15\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
- vs16\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
- vs17\$(GDKBROADWAY_VS1X_PROJ_FILTERS)
-
-GTK3_BROADWAYD_VC1X_PROJS = \
- vs10\$(BROADWAYD_VS1X_PROJ) \
- vs11\$(BROADWAYD_VS1X_PROJ) \
- vs12\$(BROADWAYD_VS1X_PROJ) \
- vs14\$(BROADWAYD_VS1X_PROJ) \
- vs15\$(BROADWAYD_VS1X_PROJ) \
- vs16\$(BROADWAYD_VS1X_PROJ) \
- vs17\$(BROADWAYD_VS1X_PROJ)
-
-GTK3_BROADWAYD_VC1X_PROJ_FILTERS = \
- vs11\$(BROADWAYD_VS1X_PROJ_FILTERS) \
- vs12\$(BROADWAYD_VS1X_PROJ_FILTERS) \
- vs14\$(BROADWAYD_VS1X_PROJ_FILTERS) \
- vs15\$(BROADWAYD_VS1X_PROJ_FILTERS) \
- vs16\$(BROADWAYD_VS1X_PROJ_FILTERS) \
- vs17\$(BROADWAYD_VS1X_PROJ_FILTERS)
-
-GTK3_DEMO_VC1X_PROJS = \
- vs10\$(DEMO_VS1X_PROJ) \
- vs11\$(DEMO_VS1X_PROJ) \
- vs12\$(DEMO_VS1X_PROJ) \
- vs14\$(DEMO_VS1X_PROJ) \
- vs15\$(DEMO_VS1X_PROJ) \
- vs16\$(DEMO_VS1X_PROJ) \
- vs17\$(DEMO_VS1X_PROJ)
-
-GTK3_DEMO_VC1X_PROJ_FILTERS = \
- vs11\$(DEMO_VS1X_PROJ_FILTERS) \
- vs12\$(DEMO_VS1X_PROJ_FILTERS) \
- vs14\$(DEMO_VS1X_PROJ_FILTERS) \
- vs15\$(DEMO_VS1X_PROJ_FILTERS) \
- vs16\$(DEMO_VS1X_PROJ_FILTERS) \
- vs17\$(DEMO_VS1X_PROJ_FILTERS)
-
-GTK3_GDK_WIN32_VCPROJS = \
- vs9\$(GDKWIN32_VS9_PROJ) \
- $(GTK3_GDK_WIN32_VC1X_PROJS) \
- $(GTK3_GDK_WIN32_VC1X_PROJ_FILTERS)
-
-GTK3_GDK_BROADWAY_VCPROJS = \
- vs9\$(GDKBROADWAY_VS9_PROJ) \
- $(GTK3_GDK_BROADWAY_VC1X_PROJS) \
- $(GTK3_GDK_BROADWAY_VC1X_PROJ_FILTERS)
-
-GTK3_BROADWAYD_VCPROJS = \
- vs9\$(BROADWAYD_VS9_PROJ) \
- $(GTK3_BROADWAYD_VC1X_PROJS) \
- $(GTK3_BROADWAYD_VC1X_PROJ_FILTERS)
-
-GTK3_GDK_VCPROJS = \
- vs9\$(GDK_VS9_PROJ) \
- $(GTK3_GDK_VC1X_PROJS) \
- $(GTK3_GDK_VC1X_PROJ_FILTERS) \
- $(GTK3_GDK_WIN32_VCPROJS) \
- $(GTK3_GDK_BROADWAY_VCPROJS) \
- $(GTK3_BROADWAYD_VCPROJS)
-
-GTK3_DEMO_VCPROJS = \
- vs9\$(DEMO_VS9_PROJ) \
- $(GTK3_DEMO_VC1X_PROJS) \
- $(GTK3_DEMO_VC1X_PROJ_FILTERS)
-
EMOJI_GRESOURCE_XML = \
.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\de.gresource.xml \
.\vs$(VSVER)\$(CFG)\$(PLAT)\bin\es.gresource.xml \
@@ -410,6 +297,46 @@ gdk3-broadway.sourcefiles: $(GDK_BROADWAY_C_SRCS)
gdk3-broadway.vs10.sourcefiles: $(GDK_BROADWAY_C_SRCS)
gdk3-broadway.vs10.sourcefiles.filters: $(GDK_BROADWAY_C_SRCS)
+# GTK projects-Darn the fatal error U1095...!
+gtk-3.misc.sourcefiles: $(GTK_MISC_C_SRCS:/=\)
+gtk-3.a-h.sourcefiles: $(GTK_C_SRCS_A_H:/=\)
+gtk-3.i-w.sourcefiles: $(GTK_C_SRCS_I_W:/=\)
+gtk-3.win32.sourcefiles: $(GTK_OS_WIN32_C_SRCS:/=\) $(GTK_MORE_C_SRCS)
+gtk-3.misc.vs10.sourcefiles: $(GTK_MISC_C_SRCS:/=\)
+gtk-3.a-h.vs10.sourcefiles: $(GTK_C_SRCS_A_H:/=\)
+gtk-3.i-w.vs10.sourcefiles: $(GTK_C_SRCS_I_W:/=\)
+gtk-3.win32.vs10.sourcefiles: $(GTK_OS_WIN32_C_SRCS:/=\) $(GTK_MORE_C_SRCS)
+gtk-3.misc.vs10.sourcefiles.filters: $(GTK_MISC_C_SRCS:/=\)
+gtk-3.a-h.vs10.sourcefiles.filters: $(GTK_C_SRCS_A_H:/=\)
+gtk-3.i-w.vs10.sourcefiles.filters: $(GTK_C_SRCS_I_W:/=\)
+gtk-3.win32.vs10.sourcefiles.filters: $(GTK_OS_WIN32_C_SRCS:/=\) $(GTK_MORE_C_SRCS)
+
+gtk-3.sourcefiles: \
+ gtk-3.a-h.sourcefiles \
+ gtk-3.i-w.sourcefiles \
+ gtk-3.misc.sourcefiles \
+ gtk-3.win32.sourcefiles
+
+gtk-3.vs10.sourcefiles: \
+ gtk-3.a-h.vs10.sourcefiles \
+ gtk-3.i-w.vs10.sourcefiles \
+ gtk-3.misc.vs10.sourcefiles \
+ gtk-3.win32.vs10.sourcefiles
+
+gtk-3.vs10.sourcefiles.filters: \
+ gtk-3.a-h.vs10.sourcefiles.filters \
+ gtk-3.i-w.vs10.sourcefiles.filters \
+ gtk-3.misc.vs10.sourcefiles.filters \
+ gtk-3.win32.vs10.sourcefiles.filters
+
+gtk-3.sourcefiles gtk-3.vs10.sourcefiles gtk-3.vs10.sourcefiles.filters:
+ @echo Genarating the final $@ from $**...
+ @for %%f in ($**) do @type %%f>>$@ & del %%f
+
+gailutil-3.sourcefiles: $(GAILUTIL_C_SRCS)
+gailutil-3.vs10.sourcefiles: $(GAILUTIL_C_SRCS)
+gailutil-3.vs10.sourcefiles.filters: $(GAILUTIL_C_SRCS)
+
# Dependencies for executable projects
broadwayd.sourcefiles: $(BROADWAYD_C_SRCS)
broadwayd.vs10.sourcefiles: $(BROADWAYD_C_SRCS)
@@ -419,36 +346,69 @@ gtk3-demo.vs10.sourcefiles: $(demo_actual_sources) $(more_demo_sources)
gtk3-demo.vs10.sourcefiles.filters: $(demo_actual_sources) $(more_demo_sources)
gdk-3.sourcefiles gdk3-win32.sourcefiles gdk3-broadway.sourcefiles \
+gailutil-3.sourcefiles \
broadwayd.sourcefiles gtk3-demo.sourcefiles:
@-del vs9\$(@B).vcproj
@for %%s in ($**) do @echo. ^<File RelativePath^="..\%%s" /^>>>$@
+gtk-3.a-h.sourcefiles gtk-3.i-w.sourcefiles \
+gtk-3.misc.sourcefiles gtk-3.win32.sourcefiles:
+ @echo Generating $@...
+ @if exist vs9\$(GTK_VS9_PROJ) del vs9\$(GTK_VS9_PROJ)
+ @for %%s in ($(**:..\gtk\=)) do @echo. ^<File RelativePath^="..\..\gtk\%%s" /^>>>$@
+
gdk-3.vs10.sourcefiles \
gdk3-win32.vs10.sourcefiles \
gdk3-broadway.vs10.sourcefiles \
+gailutil-3.vs10.sourcefiles \
broadwayd.vs10.sourcefiles \
gtk3-demo.vs10.sourcefiles:
+ @echo Generating $@...
@-del vs10\$(@B:.vs10=.vcxproj)
@for %%s in ($**) do @echo. ^<ClCompile Include^="..\%%s" /^>>>$@
+gtk-3.a-h.vs10.sourcefiles \
+gtk-3.i-w.vs10.sourcefiles \
+gtk-3.misc.vs10.sourcefiles \
+gtk-3.win32.vs10.sourcefiles:
+ @echo Generating $@...
+ @if exist vs10\$(GTK_VS1X_PROJ) del vs10\$(GTK_VS1X_PROJ)
+ @for %%s in ($(**:..\gtk\=)) do @echo. ^<ClCompile Include^="..\..\gtk\%%s" /^>>>$@
+
gdk-3.vs10.sourcefiles.filters \
gdk3-win32.vs10.sourcefiles.filters \
gdk3-broadway.vs10.sourcefiles.filters \
+gailutil-3.vs10.sourcefiles.filters \
broadwayd.vs10.sourcefiles.filters \
gtk3-demo.vs10.sourcefiles.filters:
@-del vs10\$(@F:.vs10.sourcefiles=.vcxproj)
@for %%s in ($**) do @echo. ^<ClCompile Include^="..\%%s"^>^<Filter^>Source
Files^</Filter^>^</ClCompile^>>>$@
+gtk-3.a-h.vs10.sourcefiles.filters \
+gtk-3.i-w.vs10.sourcefiles.filters \
+gtk-3.misc.vs10.sourcefiles.filters \
+gtk-3.win32.vs10.sourcefiles.filters:
+ @if exist vs10\$(GTK_VS1X_PROJ_FILTERS) del vs10\$(GTK_VS1X_PROJ_FILTERS)
+ @for %%s in ($(**:..\gtk\=)) do @echo. ^<ClCompile Include^="..\..\gtk\%%s"^>^<Filter^>Source
Files^</Filter^>^</ClCompile^>>>$@
+
# Dependencies for GDK projects
vs9\$(GDK_VS9_PROJ): gdk-3.sourcefiles vs9\$(GDK_VS9_PROJ)in
-vs10\$(GDK_VS1X_PROJ): gdk-3.vs10.sourcefiles vs10\$(GDK_VS1X_PROJ)in
-vs10\$(GDK_VS1X_PROJ_FILTERS): gdk-3.vs10.sourcefiles.filters vs10\$(GDK_VS1X_PROJ_FILTERS)in
vs9\$(GDKWIN32_VS9_PROJ).pre: gdk3-win32.sourcefiles vs9\$(GDKWIN32_VS9_PROJ)in
-vs10\$(GDKWIN32_VS1X_PROJ).pre: gdk3-win32.vs10.sourcefiles vs10\$(GDKWIN32_VS1X_PROJ)in
-vs10\$(GDKWIN32_VS1X_PROJ_FILTERS): gdk3-win32.vs10.sourcefiles.filters vs10\$(GDKWIN32_VS1X_PROJ_FILTERS)in
vs9\$(GDKBROADWAY_VS9_PROJ): gdk3-broadway.sourcefiles vs9\$(GDKBROADWAY_VS9_PROJ)in
+vs9\$(GTK_VS9_PROJ): gtk-3.sourcefiles vs9\$(GTK_VS9_PROJ)in
+vs9\$(GAILUTIL_VS9_PROJ): gailutil-3.sourcefiles vs9\$(GAILUTIL_VS9_PROJ)in
+
+vs10\$(GDK_VS1X_PROJ): gdk-3.vs10.sourcefiles vs10\$(GDK_VS1X_PROJ)in
+vs10\$(GDKWIN32_VS1X_PROJ).pre: gdk3-win32.vs10.sourcefiles vs10\$(GDKWIN32_VS1X_PROJ)in
vs10\$(GDKBROADWAY_VS1X_PROJ): gdk3-broadway.vs10.sourcefiles vs10\$(GDKBROADWAY_VS1X_PROJ)in
+vs10\$(GTK_VS1X_PROJ): gtk-3.vs10.sourcefiles vs10\$(GTK_VS1X_PROJ)in
+vs10\$(GAILUTIL_VS1X_PROJ): gailutil-3.vs10.sourcefiles vs10\$(GAILUTIL_VS1X_PROJ)in
+
+vs10\$(GDK_VS1X_PROJ_FILTERS): gdk-3.vs10.sourcefiles.filters vs10\$(GDK_VS1X_PROJ_FILTERS)in
+vs10\$(GDKWIN32_VS1X_PROJ_FILTERS): gdk3-win32.vs10.sourcefiles.filters vs10\$(GDKWIN32_VS1X_PROJ_FILTERS)in
vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS): gdk3-broadway.vs10.sourcefiles.filters
vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS)in
+vs10\$(GTK_VS1X_PROJ_FILTERS): gtk-3.vs10.sourcefiles.filters vs10\$(GTK_VS1X_PROJ_FILTERS)in
+vs10\$(GAILUTIL_VS1X_PROJ_FILTERS): gailutil-3.vs10.sourcefiles.filters vs10\$(GAILUTIL_VS1X_PROJ_FILTERS)in
# Dependencies for tool executables
vs9\$(BROADWAYD_VS9_PROJ): broadwayd.sourcefiles vs9\$(BROADWAYD_VS9_PROJ)in
@@ -462,19 +422,25 @@ vs10\$(DEMO_VS1X_PROJ_FILTERS): gtk3-demo.vs10.sourcefiles.filters vs10\$(DEMO_V
# Create the project files themselves without customization with options
vs9\$(GDKWIN32_VS9_PROJ).pre \
-vs10\$(GDKWIN32_VS1X_PROJ).pre \
-vs10\$(GDKWIN32_VS1X_PROJ_FILTERS) \
vs9\$(GDKBROADWAY_VS9_PROJ) \
-vs10\$(GDKBROADWAY_VS1X_PROJ) \
-vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
vs9\$(GDK_VS9_PROJ) \
-vs10\$(GDK_VS1X_PROJ) \
-vs10\$(GDK_VS1X_PROJ_FILTERS) \
+vs9\$(GTK_VS9_PROJ) \
+vs9\$(GAILUTIL_VS9_PROJ) \
vs9\$(BROADWAYD_VS9_PROJ) \
-vs10\$(BROADWAYD_VS1X_PROJ) \
-vs10\$(BROADWAYD_VS1X_PROJ_FILTERS) \
vs9\$(DEMO_VS9_PROJ).pre \
+vs10\$(GDKWIN32_VS1X_PROJ).pre \
+vs10\$(GDKBROADWAY_VS1X_PROJ) \
+vs10\$(GDK_VS1X_PROJ) \
+vs10\$(GTK_VS1X_PROJ) \
+vs10\$(GAILUTIL_VS1X_PROJ) \
+vs10\$(BROADWAYD_VS1X_PROJ) \
vs10\$(DEMO_VS1X_PROJ).pre \
+vs10\$(GDKWIN32_VS1X_PROJ_FILTERS) \
+vs10\$(GDKBROADWAY_VS1X_PROJ_FILTERS) \
+vs10\$(GDK_VS1X_PROJ_FILTERS) \
+vs10\$(GTK_VS1X_PROJ_FILTERS) \
+vs10\$(GAILUTIL_VS1X_PROJ_FILTERS) \
+vs10\$(BROADWAYD_VS1X_PROJ_FILTERS) \
vs10\$(DEMO_VS1X_PROJ_FILTERS):
@$(CPP) /nologo /EP /I. $(@:.pre=)in>$(@F:.pre=).tmp
@for /f "usebackq tokens=* delims=" %%l in ($(@F:.pre=).tmp) do @echo %%l>>$@
@@ -674,7 +640,11 @@ $(EMOJI_GRESOURCE):
@echo Generating $@...
@$(GLIB_COMPILE_RESOURCES) --sourcedir=..\gtk\emoji $@.xml --target=$@
+regenerate-gtk-vsproj-msg:
+ @echo Regenerating GTK and gailutil projects...
+
regenerate-gdk-vsproj: regenerate-gdk-vsproj-msg $(GTK3_GDK_VCPROJS)
+regenerate-gtk-vsproj: regenerate-gtk-vsproj-msg $(GTK3_GTK_VCPROJS) $(GTK3_GAILUTIL_VCPROJS)
regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) $(GTK3_DEMO_VCPROJS)
@echo Regenerating demos.h.win32 and gtk3-demo VS project files...
@@ -683,6 +653,12 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources)
@$(PYTHON) geninclude.py demos.h.win32 $(demo_sources)
@cd ..\..\win32
+regenerate-all-msvc-projs: \
+ copy-update-static-projects \
+ regenerate-gdk-vsproj \
+ regenerate-gtk-vsproj \
+ regenerate-demos-h-win32
+
..\po\gtk30.pot: ..\gtk\gtkbuilder.its
$(XGETTEXT) --default-domain="$(@B)" \
--copyright-holder="GTK+ Team and others. See AUTHORS" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
