From cb494e0ad8b18811e26200cbc9659309423b55eb Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 13 May 2022 18:35:54 +0800 Subject: [PATCH 01/21] gdk/win32: Split out sources listing This way, we can reuse this list in other non-autotools Makefile-based build systems. --- gdk/win32/Makefile.am | 71 +------------------------------- gdk/win32/gdk-win32-sources.inc | 72 +++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 69 deletions(-) create mode 100644 gdk/win32/gdk-win32-sources.inc diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index a2d52cecbe..a665a9cc02 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -1,5 +1,6 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl +include gdk-win32-sources.inc libgdkincludedir = $(includedir)/gtk-3.0/gdk libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32 @@ -35,79 +36,11 @@ EXTRA_DIST += \ makefile.msc \ meson.build -libgdk_win32_la_SOURCES = \ - gdkcursor-win32.c \ - gdkdevicemanager-win32.c \ - gdkdevicemanager-win32.h \ - gdkdevice-virtual.c \ - gdkdevice-virtual.h \ - gdkdevice-win32.c \ - gdkdevice-win32.h \ - gdkdevice-winpointer.c \ - gdkdevice-winpointer.h \ - gdkdevice-wintab.c \ - gdkdevice-wintab.h \ - gdkdisplay-win32.c \ - gdkdisplay-win32.h \ - gdkdisplaymanager-win32.c \ - gdkdnd-win32.c \ - gdkevents-win32.c \ - gdkgeometry-win32.c \ - gdkglcontext-win32.c \ - gdkglcontext-win32.h \ - gdkglobals-win32.c \ - gdkkeys-win32.c \ - gdkkeys-win32.h \ - gdkkeys-win32-impl.c \ - gdkkeys-win32-impl-wow64.c \ - gdkmain-win32.c \ - gdkmonitor-win32.c \ - gdkmonitor-win32.h \ - gdkprivate-win32.h \ - gdkproperty-win32.c \ - gdkscreen-win32.c \ - gdkselection-win32.c \ - gdkselection-win32.h \ - gdktestutils-win32.c \ - gdkwin32cursor.h \ - gdkwin32display.h \ - gdkwin32displaymanager.h \ - gdkwin32dnd.h \ - gdkwin32dnd-private.h \ - gdkwin32glcontext.h \ - gdkwin32langnotification.c \ - gdkwin32langnotification.h \ - gdkwin32.h \ - gdkwin32id.c \ - gdkwin32keys.h \ - gdkwin32monitor.h \ - gdkwin32screen.h \ - gdkwin32window.h \ - gdkwindow-win32.c \ - gdkwindow-win32.h \ - pktdef.h \ - winpointer.h \ - wintab.h \ - xcursors.h - libgdk_win32_la_LIBADD = \ $(LDADDS) \ $(NULL) -libgdkinclude_HEADERS = \ - gdkwin32.h - -libgdkwin32include_HEADERS = \ - gdkwin32cursor.h \ - gdkwin32display.h \ - gdkwin32displaymanager.h\ - gdkwin32dnd.h \ - gdkwin32glcontext.h \ - gdkwin32keys.h \ - gdkwin32misc.h \ - gdkwin32monitor.h \ - gdkwin32screen.h \ - gdkwin32window.h +libgdkinclude_HEADERS = $(GDK_PUBLIC_H_SRCS_WIN32) # ------------------- MSVC Build Items ---------------- MSVCPROJS = gdk3-win32 diff --git a/gdk/win32/gdk-win32-sources.inc b/gdk/win32/gdk-win32-sources.inc new file mode 100644 index 0000000000..b162787058 --- /dev/null +++ b/gdk/win32/gdk-win32-sources.inc @@ -0,0 +1,72 @@ +# Public header list for GdkWin32 + +GDK_PUBLIC_H_SRCS_WIN32 = \ + gdkwin32.h + +libgdkwin32include_HEADERS = \ + gdkwin32cursor.h \ + gdkwin32display.h \ + gdkwin32displaymanager.h\ + gdkwin32dnd.h \ + gdkwin32glcontext.h \ + gdkwin32keys.h \ + gdkwin32misc.h \ + gdkwin32monitor.h \ + gdkwin32screen.h \ + gdkwin32window.h + +# Sources list for GdkWin32 +libgdk_win32_la_SOURCES = \ + gdkcursor-win32.c \ + gdkdevicemanager-win32.c \ + gdkdevicemanager-win32.h \ + gdkdevice-virtual.c \ + gdkdevice-virtual.h \ + gdkdevice-win32.c \ + gdkdevice-win32.h \ + gdkdevice-winpointer.c \ + gdkdevice-winpointer.h \ + gdkdevice-wintab.c \ + gdkdevice-wintab.h \ + gdkdisplay-win32.c \ + gdkdisplay-win32.h \ + gdkdisplaymanager-win32.c \ + gdkdnd-win32.c \ + gdkevents-win32.c \ + gdkgeometry-win32.c \ + gdkglcontext-win32.c \ + gdkglcontext-win32.h \ + gdkglobals-win32.c \ + gdkkeys-win32.c \ + gdkkeys-win32.h \ + gdkkeys-win32-impl.c \ + gdkkeys-win32-impl-wow64.c \ + gdkmain-win32.c \ + gdkmonitor-win32.c \ + gdkmonitor-win32.h \ + gdkprivate-win32.h \ + gdkproperty-win32.c \ + gdkscreen-win32.c \ + gdkselection-win32.c \ + gdkselection-win32.h \ + gdktestutils-win32.c \ + gdkwin32cursor.h \ + gdkwin32display.h \ + gdkwin32displaymanager.h \ + gdkwin32dnd.h \ + gdkwin32dnd-private.h \ + gdkwin32glcontext.h \ + gdkwin32langnotification.c \ + gdkwin32langnotification.h \ + gdkwin32.h \ + gdkwin32id.c \ + gdkwin32keys.h \ + gdkwin32monitor.h \ + gdkwin32screen.h \ + gdkwin32window.h \ + gdkwindow-win32.c \ + gdkwindow-win32.h \ + pktdef.h \ + winpointer.h \ + wintab.h \ + xcursors.h From def4b6c95fd3d2cab59c6b042c73859e539c21e4 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 13 May 2022 18:41:15 +0800 Subject: [PATCH 02/21] gdk/broadway: Split out sources listing This way, we can reuse these lists in other non-autotools Makefile-based build systems. --- gdk/broadway/Makefile.am | 51 ++----------------------- gdk/broadway/gdk-broadway-sources.inc | 55 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 48 deletions(-) create mode 100644 gdk/broadway/gdk-broadway-sources.inc diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am index a43a577686..81725deabb 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -1,5 +1,6 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl +include gdk-broadway-sources.inc NULL = libgdkincludedir = $(includedir)/gtk-3.0/gdk @@ -23,15 +24,7 @@ noinst_LTLIBRARIES = libgdk-broadway.la bin_PROGRAMS = broadwayd -libgdkinclude_HEADERS = \ - gdkbroadway.h - -libgdkbroadwayinclude_HEADERS = \ - gdkbroadwaydisplay.h \ - gdkbroadwaywindow.h \ - gdkbroadwaycursor.h \ - gdkbroadwaymonitor.h \ - gdkbroadwayvisual.h +libgdkinclude_HEADERS = $(GDK_PUBLIC_H_SRCS_BROADWAY) EXTRA_DIST += toarray.pl @@ -46,40 +39,12 @@ broadwayjs.h: broadway.js rawinflate.min.js EXTRA_DIST += broadway.js rawinflate.min.js # built headers that don't get installed -broadway_built_private_headers = \ - clienthtml.h \ - broadwayjs.h - broadway_built_sources = \ ${broadway_built_private_headers} libgdk_broadway_la_SOURCES = \ ${broadway_built_private_headers}\ - gdkcursor-broadway.c \ - gdkdevice-broadway.h \ - gdkdevice-broadway.c \ - gdkdevicemanager-broadway.h \ - gdkdevicemanager-broadway.c \ - gdkdisplay-broadway.c \ - gdkdisplay-broadway.h \ - gdkdnd-broadway.c \ - gdkeventsource.c \ - gdkeventsource.h \ - gdkglobals-broadway.c \ - gdkkeys-broadway.c \ - gdkmonitor-broadway.c \ - gdkmonitor-broadway.h \ - gdkproperty-broadway.c \ - gdkscreen-broadway.c \ - gdkscreen-broadway.h \ - gdkselection-broadway.c \ - gdktestutils-broadway.c \ - gdkvisual-broadway.c \ - gdkwindow-broadway.c \ - gdkwindow-broadway.h \ - gdkprivate-broadway.h \ - gdkbroadway-server.h \ - gdkbroadway-server.c + $(GDK_BROADWAY_NON_GENERATED_SOURCES) if OS_UNIX libgdk_broadway_la_LIBADD = \ @@ -87,16 +52,6 @@ libgdk_broadway_la_LIBADD = \ $(NULL) endif -broadwayd_SOURCES = \ - broadway-protocol.h \ - broadwayd.c \ - broadway-server.h \ - broadway-server.c \ - broadway-buffer.c \ - broadway-buffer.h \ - broadway-output.h \ - broadway-output.c - if OS_WIN32 broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32 else diff --git a/gdk/broadway/gdk-broadway-sources.inc b/gdk/broadway/gdk-broadway-sources.inc new file mode 100644 index 0000000000..dd047f9a7d --- /dev/null +++ b/gdk/broadway/gdk-broadway-sources.inc @@ -0,0 +1,55 @@ +# Public header list for GdkBroadway + +GDK_PUBLIC_H_SRCS_BROADWAY = \ + gdkbroadway.h + +libgdkbroadwayinclude_HEADERS = \ + gdkbroadwaydisplay.h \ + gdkbroadwaywindow.h \ + gdkbroadwaycursor.h \ + gdkbroadwaymonitor.h \ + gdkbroadwayvisual.h + +# built headers that don't get installed + +broadway_built_private_headers = \ + clienthtml.h \ + broadwayjs.h + +# Other non-generated sources +GDK_BROADWAY_NON_GENERATED_SOURCES = \ + gdkcursor-broadway.c \ + gdkdevice-broadway.h \ + gdkdevice-broadway.c \ + gdkdevicemanager-broadway.h \ + gdkdevicemanager-broadway.c \ + gdkdisplay-broadway.c \ + gdkdisplay-broadway.h \ + gdkdnd-broadway.c \ + gdkeventsource.c \ + gdkeventsource.h \ + gdkglobals-broadway.c \ + gdkkeys-broadway.c \ + gdkmonitor-broadway.c \ + gdkmonitor-broadway.h \ + gdkproperty-broadway.c \ + gdkscreen-broadway.c \ + gdkscreen-broadway.h \ + gdkselection-broadway.c \ + gdktestutils-broadway.c \ + gdkvisual-broadway.c \ + gdkwindow-broadway.c \ + gdkwindow-broadway.h \ + gdkprivate-broadway.h \ + gdkbroadway-server.h \ + gdkbroadway-server.c + +broadwayd_SOURCES = \ + broadway-protocol.h \ + broadwayd.c \ + broadway-server.h \ + broadway-server.c \ + broadway-buffer.c \ + broadway-buffer.h \ + broadway-output.h \ + broadway-output.c From e21a578cb14a9276d5e32af5ab79f21de3f619d8 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 13 May 2022 18:54:12 +0800 Subject: [PATCH 03/21] gtk: Rename gtk-mkenums-headers.mak to gtk-sources.inc We want to reuse more sources listings in other non-autotools build systems. --- gtk/Makefile.am | 2 +- gtk/{gtk-mkenums-headers.mak => gtk-sources.inc} | 0 win32/create-lists-msvc.mak | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename gtk/{gtk-mkenums-headers.mak => gtk-sources.inc} (100%) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8fde3a0f42..5701b63657 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -114,7 +114,7 @@ endif include $(srcdir)/a11y/Makefile.inc include $(srcdir)/deprecated/Makefile.inc include $(srcdir)/inspector/Makefile.inc -include $(srcdir)/gtk-mkenums-headers.mak +include $(srcdir)/gtk-sources.inc # GTK+ header files for public installation (non-generated, or generated # by configure) diff --git a/gtk/gtk-mkenums-headers.mak b/gtk/gtk-sources.inc similarity index 100% rename from gtk/gtk-mkenums-headers.mak rename to gtk/gtk-sources.inc diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index d19e3a4d59..02eada540e 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -65,7 +65,7 @@ NULL= !endif # For GTK enumeration sources -!include ..\gtk\gtk-mkenums-headers.mak +!include ..\gtk\gtk-sources.inc !include ..\gtk\a11y\Makefile.inc !include ..\gtk\deprecated\Makefile.inc From aa83f9fb421fa31fab6866e6eeb08fa090d9523d Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 13 May 2022 19:03:47 +0800 Subject: [PATCH 04/21] gtk/Makefile.am: Split out more items ... to gtk-sources.inc, since we will want to share the items in the lists that were split out. --- gtk/Makefile.am | 798 +----------------------------------------- gtk/gtk-sources.inc | 824 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 841 insertions(+), 781 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 5701b63657..c7c7caabd2 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -122,651 +122,33 @@ include $(srcdir)/gtk-sources.inc gtk_public_h_sources = $(GTK_PUB_HDRS) if OS_UNIX -gtk_unix_print_public_h_sources = \ - gtkpagesetupunixdialog.h \ - gtkprintunixdialog.h \ - gtkprinter.h \ - gtkprintjob.h \ - gtkunixprint-autocleanups.h \ - gtkunixprint.h +gtk_unix_print_public_h_sources = $(GTK_UNIX_PRINT_PUB_HDRS) endif -# Installed header files without compatibility guarantees -# that are not included in gtk/gtk.h -gtk_semi_private_h_sources = \ - gtktextlayout.h - gtk_private_type_h_sources = $(GTK_PRIVATE_TYPE_HDRS) # GTK+ header files that don't get installed gtk_private_h_sources = \ $(inspector_h_sources) \ $(gtk_private_type_h_sources) \ - gtkactionmuxer.h \ - gtkactionobserver.h \ - gtkactionobservable.h \ - gtkadjustmentprivate.h \ - gtkapplicationaccelsprivate.h \ - gtkapplicationprivate.h \ - gtkaccelgroupprivate.h \ - gtkaccelmapprivate.h \ - gtkactionhelper.h \ - gtkallocatedbitmaskprivate.h \ - gtkappchooserprivate.h \ - gtkbindingsprivate.h \ - gtkbitmaskprivate.h \ - gtkbitmaskprivateimpl.h \ - gtkbookmarksmanager.h \ - gtkboxprivate.h \ - gtkboxgadgetprivate.h \ - gtkbuilderprivate.h \ - gtkbuiltiniconprivate.h \ - gtkbuttonprivate.h \ - gtkcairoblurprivate.h \ - gtkcellareaboxcontextprivate.h \ - gtkcheckbuttonprivate.h \ - gtkcheckmenuitemprivate.h \ - gtkclipboardprivate.h \ - gtkcolorswatchprivate.h \ - gtkcoloreditorprivate.h \ - gtkcolorpickerprivate.h \ - gtkcolorpickerkwinprivate.h \ - gtkcolorpickerportalprivate.h \ - gtkcolorpickershellprivate.h \ - gtkcolorplaneprivate.h \ - gtkcolorscaleprivate.h \ - gtkcolorchooserprivate.h \ - gtkcomboboxprivate.h \ - gtkcomposetable.h \ - gtkcontainerprivate.h \ - gtkcssanimationprivate.h \ - gtkcssanimatedstyleprivate.h \ - gtkcssarrayvalueprivate.h \ - gtkcssbgsizevalueprivate.h \ - gtkcssbordervalueprivate.h \ - gtkcsscalcvalueprivate.h \ - gtkcsscolorvalueprivate.h \ - gtkcsscornervalueprivate.h \ - gtkcsscustomgadgetprivate.h \ - gtkcsscustompropertyprivate.h \ - gtkcssdimensionvalueprivate.h \ - gtkcsseasevalueprivate.h \ - gtkcssenginevalueprivate.h \ - gtkcssenumvalueprivate.h \ - gtkcssgadgetprivate.h \ - gtkcssiconthemevalueprivate.h \ - gtkcssimagebuiltinprivate.h \ - gtkcssimagecrossfadeprivate.h \ - gtkcssimagefallbackprivate.h \ - gtkcssimagegradientprivate.h \ - gtkcssimageiconthemeprivate.h \ - gtkcssimagelinearprivate.h \ - gtkcssimageradialprivate.h \ - gtkcssimageprivate.h \ - gtkcssimagesurfaceprivate.h \ - gtkcssimageurlprivate.h \ - gtkcssimagerecolorprivate.h \ - gtkcssimagescaledprivate.h \ - gtkcssimagevalueprivate.h \ - gtkcssimagewin32private.h \ - gtkcssinheritvalueprivate.h \ - gtkcssinitialvalueprivate.h \ - gtkcsskeyframesprivate.h \ - gtkcsslookupprivate.h \ - gtkcssmatcherprivate.h \ - gtkcssnodeprivate.h \ - gtkcssnodedeclarationprivate.h \ - gtkcssnodestylecacheprivate.h \ - gtkcssnumbervalueprivate.h \ - gtkcsspalettevalueprivate.h \ - gtkcssparserprivate.h \ - gtkcsspathnodeprivate.h \ - gtkcsspositionvalueprivate.h \ - gtkcssproviderprivate.h \ - gtkcssrepeatvalueprivate.h \ - gtkcssrgbavalueprivate.h \ - gtkcsssectionprivate.h \ - gtkcssselectorprivate.h \ - gtkcssshadowsvalueprivate.h \ - gtkcssshadowvalueprivate.h \ - gtkcssshorthandpropertyprivate.h \ - gtkcssstaticstyleprivate.h \ - gtkcssstringvalueprivate.h \ - gtkcssstylefuncsprivate.h \ - gtkcssstylechangeprivate.h \ - gtkcssstyleprivate.h \ - gtkcssstylepropertyprivate.h \ - gtkcsstransformvalueprivate.h \ - gtkcsstransientnodeprivate.h \ - gtkcsstransitionprivate.h \ - gtkcsstypedvalueprivate.h \ - gtkcssunsetvalueprivate.h \ - gtkcssvalueprivate.h \ - gtkcsswin32sizevalueprivate.h \ - gtkcsswidgetnodeprivate.h \ - gtkcustompaperunixdialog.h \ - gtkdialogprivate.h \ - gtkdndprivate.h \ - gtkemojichooser.h \ - gtkemojicompletion.h \ - gtkentryprivate.h \ - gtkeventcontrollerprivate.h \ - gtkfilechooserembed.h \ - gtkfilechooserentry.h \ - gtkfilechooserprivate.h \ - gtkfilechoosernativeprivate.h \ - gtkfilechooserwidgetprivate.h \ - gtkfilechooserutils.h \ - gtkfilefilterprivate.h \ - gtkfilesystem.h \ - gtkfilesystemmodel.h \ - gtkfontchooserprivate.h \ - gtkfontchooserutils.h \ - gtkfontchooserwidgetprivate.h \ - gtkgestureprivate.h \ - gtkgesturedragprivate.h \ - gtkgesturelongpressprivate.h \ - gtkgesturemultipressprivate.h \ - gtkgesturepanprivate.h \ - gtkgesturerotateprivate.h \ - gtkgesturesingleprivate.h \ - gtkgesturestylusprivate.h \ - gtkgestureswipeprivate.h \ - gtkgesturezoomprivate.h \ - gtkheaderbarprivate.h \ - gtkhslaprivate.h \ - gtkiconcache.h \ - gtkiconhelperprivate.h \ - gtkiconprivate.h \ - gtkiconthemeprivate.h \ - gtkiconviewprivate.h \ - gtkimagedefinitionprivate.h \ - gtkimageprivate.h \ - gtkimmoduleprivate.h \ - gtkimcontextsimpleseqs.h \ - gtkintl.h \ - gtkkeyhash.h \ - gtkkineticscrolling.h \ - gtklabelprivate.h \ - gtklockbuttonprivate.h \ - gtkmagnifierprivate.h \ - gtkmenubuttonprivate.h \ - gtkmenuprivate.h \ - gtkmenuitemprivate.h \ - gtkmenusectionbox.h \ - gtkmenushellprivate.h \ - gtkmenutracker.h \ - gtkmenutrackeritem.h \ - gtkmnemonichash.h \ - gtkmodelmenuitem.h \ - gtkmodifierstyle.h \ - gtkmodulesprivate.h \ - gtkmountoperationprivate.h \ - gtknativedialogprivate.h \ - gtkorientableprivate.h \ - gtkpango.h \ - gtkpathbar.h \ - gtkplacessidebarprivate.h \ - gtkplacesviewprivate.h \ - gtkplacesviewrowprivate.h \ - gtkpopoverprivate.h \ - gtkprintoperation-private.h \ - gtkprintutils.h \ - gtkprivate.h \ - gtkpixelcacheprivate.h \ - gtkprogresstrackerprivate.h \ - gtkquery.h \ - gtkrangeprivate.h \ - gtkrbtree.h \ - gtkrecentchooserdefault.h \ - gtkrecentchooserprivate.h \ - gtkrecentchooserutils.h \ - gtkrenderbackgroundprivate.h \ - gtkrenderborderprivate.h \ - gtkrendericonprivate.h \ - gtkrenderprivate.h \ - gtkresources.h \ - gtkroundedboxprivate.h \ - gtksearchengine.h \ - gtksearchenginesimple.h \ - gtksearchenginemodel.h \ - gtksearchentryprivate.h \ - gtkselectionprivate.h \ - gtksettingsprivate.h \ - gtkshortcutswindowprivate.h \ - gtkshortcutsshortcutprivate.h \ - gtksidebarrowprivate.h \ - gtksizegroup-private.h \ - gtksizerequestcacheprivate.h \ - gtksocketprivate.h \ - gtkstyleanimationprivate.h \ - gtkstylecascadeprivate.h \ - gtkstylecontextprivate.h \ - gtkstylepropertyprivate.h \ - gtkstyleproviderprivate.h \ - gtktextattributesprivate.h \ - gtktextbtree.h \ - gtktextbufferprivate.h \ - gtktextbufferserialize.h \ - gtktextchildprivate.h \ - gtktexthandleprivate.h \ - gtktextiterprivate.h \ - gtktextmarkprivate.h \ - gtktextsegment.h \ - gtktexttagprivate.h \ - gtktexttagtableprivate.h \ - gtktexttypes.h \ - gtktextutil.h \ - gtktrashmonitor.h \ - gtktogglebuttonprivate.h \ - gtktoolbarprivate.h \ - gtktoolpaletteprivate.h \ - gtktooltipprivate.h \ - gtktooltipwindowprivate.h \ - gtktreedatalist.h \ - gtktreeprivate.h \ - gtkutilsprivate.h \ - gtkwidgetprivate.h \ - gtkwidgetpathprivate.h \ - gtkwin32drawprivate.h \ - gtkwin32themeprivate.h \ - gtkwindowprivate.h \ - gtktreemenu.h \ - gdkpixbufutilsprivate.h \ - open-type-layout.h \ - language-names.h \ - script-names.h + $(gtk_base_private_h_sources) # GTK+ C sources to build the library from gtk_base_c_sources = \ $(a11y_c_sources) \ $(deprecated_c_sources) \ $(inspector_c_sources) \ - gtkactionmuxer.c \ - gtkactionobserver.c \ - gtkactionobservable.c \ - gtkactionable.c \ - gtkquery.c \ - gtksearchbar.c \ - gtksearchentry.c \ - gtksearchengine.c \ - gtksearchenginesimple.c \ - gtksearchenginemodel.c \ - fnmatch.c \ - gtkaboutdialog.c \ - gtkaccelgroup.c \ - gtkaccellabel.c \ - gtkaccelmap.c \ - gtkaccessible.c \ - gtkactionbar.c \ - gtkactionhelper.c \ - gtkadjustment.c \ - gtkallocatedbitmask.c \ - gtkappchooser.c \ - gtkappchooserwidget.c \ - gtkappchooserbutton.c \ - gtkappchooserdialog.c \ - gtkapplication.c \ - gtkapplicationaccels.c \ - gtkapplicationimpl.c \ - gtkapplicationwindow.c \ - gtkaspectframe.c \ - gtkassistant.c \ - gtkbbox.c \ - gtkbin.c \ - gtkbindings.c \ - gtkbookmarksmanager.c \ - gtkborder.c \ - gtkbox.c \ - gtkboxgadget.c \ - gtkbuildable.c \ - gtkbuilder.c \ - gtkbuilderparser.c \ - gtkbuilder-menus.c \ - gtkbuiltinicon.c \ - gtkbutton.c \ - gtkcairoblur.c \ - gtkcalendar.c \ - gtkcellarea.c \ - gtkcellareabox.c \ - gtkcellareaboxcontext.c \ - gtkcellareacontext.c \ - gtkcelleditable.c \ - gtkcelllayout.c \ - gtkcellrenderer.c \ - gtkcellrendereraccel.c \ - gtkcellrenderercombo.c \ - gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c \ - gtkcellrendererspin.c \ - gtkcellrendererspinner.c \ - gtkcellrenderertext.c \ - gtkcellrenderertoggle.c \ - gtkcellview.c \ - gtkcheckbutton.c \ - gtkcheckmenuitem.c \ - gtkcolorbutton.c \ - gtkcolorchooser.c \ - gtkcolorchooserwidget.c \ - gtkcolorchooserdialog.c \ - gtkcoloreditor.c \ - gtkcolorpicker.c \ - gtkcolorpickerkwin.c \ - gtkcolorpickerportal.c \ - gtkcolorpickershell.c \ - gtkcolorplane.c \ - gtkcolorscale.c \ - gtkcolorswatch.c \ - gtkcolorutils.c \ - gtkcombobox.c \ - gtkcomboboxtext.c \ - gtkcomposetable.c \ - gtkcontainer.c \ - gtkcssanimation.c \ - gtkcssanimatedstyle.c \ - gtkcssarrayvalue.c \ - gtkcssbgsizevalue.c \ - gtkcssbordervalue.c \ - gtkcsscalcvalue.c \ - gtkcsscolorvalue.c \ - gtkcsscornervalue.c \ - gtkcsscustomgadget.c \ - gtkcsscustomproperty.c \ - gtkcssdimensionvalue.c \ - gtkcsseasevalue.c \ - gtkcssenumvalue.c \ - gtkcssenginevalue.c \ - gtkcssgadget.c \ - gtkcssiconthemevalue.c \ - gtkcssimage.c \ - gtkcssimagebuiltin.c \ - gtkcssimagecrossfade.c \ - gtkcssimagefallback.c \ - gtkcssimagegradient.c \ - gtkcssimageicontheme.c \ - gtkcssimagelinear.c \ - gtkcssimageradial.c \ - gtkcssimagesurface.c \ - gtkcssimageurl.c \ - gtkcssimagerecolor.c \ - gtkcssimagescaled.c \ - gtkcssimagevalue.c \ - gtkcssimagewin32.c \ - gtkcssinheritvalue.c \ - gtkcssinitialvalue.c \ - gtkcsskeyframes.c \ - gtkcsslookup.c \ - gtkcssmatcher.c \ - gtkcssnode.c \ - gtkcssnodedeclaration.c \ - gtkcssnodestylecache.c \ - gtkcssnumbervalue.c \ - gtkcsspalettevalue.c \ - gtkcssparser.c \ - gtkcsspathnode.c \ - gtkcsspositionvalue.c \ - gtkcssprovider.c \ - gtkcssrepeatvalue.c \ - gtkcssrgbavalue.c \ - gtkcsssection.c \ - gtkcssselector.c \ - gtkcssstringvalue.c \ - gtkcssstyle.c \ - gtkcssstylechange.c \ - gtkcssshadowsvalue.c \ - gtkcssshadowvalue.c \ - gtkcssshorthandproperty.c \ - gtkcssshorthandpropertyimpl.c \ - gtkcssstaticstyle.c \ - gtkcssstylefuncs.c \ - gtkcssstyleproperty.c \ - gtkcssstylepropertyimpl.c \ - gtkcsstransformvalue.c \ - gtkcsstransientnode.c \ - gtkcsstransition.c \ - gtkcsstypedvalue.c \ - gtkcssunsetvalue.c \ - gtkcsstypes.c \ - gtkcssvalue.c \ - gtkcsswidgetnode.c \ - gtkcsswin32sizevalue.c \ - gtkdialog.c \ - gtkdragsource.c \ - gtkdrawingarea.c \ - gtkeditable.c \ - gtkemojichooser.c \ - gtkemojicompletion.c \ - gtkentry.c \ - gtkentrybuffer.c \ - gtkentrycompletion.c \ - gtkeventbox.c \ - gtkeventcontroller.c \ - gtkeventcontrollerkey.c \ - gtkeventcontrollermotion.c \ - gtkeventcontrollerscroll.c \ - gtkexpander.c \ - gtkfilechooser.c \ - gtkfilechooserbutton.c \ - gtkfilechooserdialog.c \ - gtkfilechooserembed.c \ - gtkfilechooserentry.c \ - gtkfilechoosernative.c \ - gtkfilechoosernativeportal.c \ - gtkfilechooserutils.c \ - gtkfilechooserwidget.c \ - gtkfilefilter.c \ - gtkfilesystem.c \ - gtkfilesystemmodel.c \ - gtkfixed.c \ - gtkflowbox.c \ - gtkfontbutton.c \ - gtkfontchooser.c \ - gtkfontchooserdialog.c \ - gtkfontchooserutils.c \ - gtkfontchooserwidget.c \ - gtkframe.c \ - gtkgladecatalog.c \ - gtkgesture.c \ - gtkgesturedrag.c \ - gtkgesturelongpress.c \ - gtkgesturemultipress.c \ - gtkgesturepan.c \ - gtkgesturerotate.c \ - gtkgesturesingle.c \ - gtkgesturestylus.c \ - gtkgestureswipe.c \ - gtkgesturezoom.c \ - gtkglarea.c \ - gtkgrid.c \ - gtkheaderbar.c \ - gtkhsla.c \ - gtkicon.c \ - gtkiconcache.c \ - gtkiconcachevalidator.c \ - gtkiconhelper.c \ - gtkicontheme.c \ - gtkiconview.c \ - gtkimage.c \ - gtkimagedefinition.c \ - gtkimcontext.c \ - gtkimcontextsimple.c \ - gtkimmodule.c \ - gtkimmulticontext.c \ - gtkinfobar.c \ - gtkinvisible.c \ - gtkkeyhash.c \ - gtkkineticscrolling.c \ - gtklabel.c \ - gtklayout.c \ - gtklevelbar.c \ - gtklinkbutton.c \ - gtklistbox.c \ - gtkliststore.c \ - gtklockbutton.c \ - gtkmain.c \ - gtkmagnifier.c \ - gtkmenu.c \ - gtkmenubar.c \ - gtkmenubutton.c \ - gtkmenuitem.c \ - gtkmenusectionbox.c \ - gtkmenushell.c \ - gtkmenutracker.c \ - gtkmenutrackeritem.c \ - gtkmenutoolbutton.c \ - gtkmessagedialog.c \ - gtkmnemonichash.c \ - gtkmodelmenuitem.c \ - gtkmodelbutton.c \ - gtkmodifierstyle.c \ - gtkmodules.c \ - gtkmountoperation.c \ - gtknativedialog.c \ - gtknotebook.c \ - gtkoffscreenwindow.c \ - gtkorientable.c \ - gtkoverlay.c \ - gtkpadcontroller.c \ - gtkpagesetup.c \ - gtkpaned.c \ - gtkpango.c \ - gtkpapersize.c \ - gtkpathbar.c \ - gtkplacessidebar.c \ - gtkplacesview.c \ - gtkplacesviewrow.c \ - gtkprintcontext.c \ - gtkprintoperation.c \ - gtkprintoperationpreview.c \ - gtkprintsettings.c \ - gtkprintutils.c \ - gtkprivate.c \ - gtkprogressbar.c \ - gtkprogresstracker.c \ - gtkpixelcache.c \ - gtkpopover.c \ - gtkpopovermenu.c \ - gtkradiobutton.c \ - gtkradiomenuitem.c \ - gtkradiotoolbutton.c \ - gtkrange.c \ - gtkrbtree.c \ - gtkrecentchooserdefault.c \ - gtkrecentchooserdialog.c \ - gtkrecentchoosermenu.c \ - gtkrecentchooserwidget.c \ - gtkrecentchooserutils.c \ - gtkrecentchooser.c \ - gtkrecentfilter.c \ - gtkrecentmanager.c \ - gtkrender.c \ - gtkrenderbackground.c \ - gtkrenderborder.c \ - gtkrendericon.c \ - gtkrevealer.c \ - gtkroundedbox.c \ - gtkscale.c \ - gtkscalebutton.c \ - gtkscrollable.c \ - gtkscrollbar.c \ - gtkscrolledwindow.c \ - gtkselection.c \ - gtkseparator.c \ - gtkseparatormenuitem.c \ - gtkseparatortoolitem.c \ - gtksettings.c \ - gtkshortcutsgroup.c \ - gtkshortcutlabel.c \ - gtkshortcutsshortcut.c \ - gtkshortcutssection.c \ - gtkshortcutswindow.c \ - gtksidebarrow.c \ - gtksizegroup.c \ - gtksizerequest.c \ - gtksizerequestcache.c \ - gtkshow.c \ - gtkstacksidebar.c \ - gtkspinbutton.c \ - gtkspinner.c \ - gtkstack.c \ - gtkstackswitcher.c \ - gtkstatusbar.c \ - gtkstyleanimation.c \ - gtkstylecascade.c \ - gtkstylecontext.c \ - gtkstyleproperty.c \ - gtkstyleprovider.c \ - gtkstyleproviderprivate.c \ - gtkswitch.c \ - gtktestutils.c \ - gtktextattributes.c \ - gtktextbtree.c \ - gtktextbuffer.c \ - gtktextbufferrichtext.c \ - gtktextbufferserialize.c \ - gtktextchild.c \ - gtktextdisplay.c \ - gtktexthandle.c \ - gtktextiter.c \ - gtktextlayout.c \ - gtktextmark.c \ - gtktextsegment.c \ - gtktexttag.c \ - gtktexttagtable.c \ - gtktexttypes.c \ - gtktextutil.c \ - gtktextview.c \ - gtktogglebutton.c \ - gtktoggletoolbutton.c \ - gtktoolbar.c \ - gtktoolbutton.c \ - gtktoolitem.c \ - gtktoolitemgroup.c \ - gtktoolpalette.c \ - gtktoolshell.c \ - gtktooltip.c \ - gtktooltipwindow.c \ - gtktrashmonitor.c \ - gtktreedatalist.c \ - gtktreednd.c \ - gtktreemenu.c \ - gtktreemodel.c \ - gtktreemodelfilter.c \ - gtktreemodelsort.c \ - gtktreeselection.c \ - gtktreesortable.c \ - gtktreestore.c \ - gtktreeview.c \ - gtktreeviewcolumn.c \ - gtkutils.c \ - gtkvolumebutton.c \ - gtkviewport.c \ - gtkwidget.c \ - gtkwidgetpath.c \ - gtkwindow.c \ - gtkwindowgroup.c \ - gtkwin32draw.c \ - gtkwin32theme.c \ - gdkpixbufutils.c \ - language-names.c \ - script-names.c + $(gtk_base_c_sources_base) if USE_QUARTZ -gtk_base_c_sources += \ - gtkclipboard-quartz.c \ - gtkdnd-quartz.c +gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_quartz) else -gtk_base_c_sources += \ - gtkclipboard.c \ - gtkdnd.c \ - gtkdragdest.c +gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_generic) endif nodist_gtk_c_sources = gtk_c_sources = $(gtk_base_c_sources) -gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h - $(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.Gtk. \ @@ -776,82 +158,24 @@ $(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml nodist_gtk_c_sources += $(gtk_dbus_built_sources) -gtk_os_unix_c_sources = \ - gtkcustompaperunixdialog.c \ - gtkpagesetupunixdialog.c \ - gtkprinter.c \ - gtkprinteroption.c \ - gtkprinteroptionset.c \ - gtkprinteroptionwidget.c \ - gtkprintjob.c \ - gtkprintoperation-unix.c \ - gtkprintoperation-portal.h \ - gtkprintoperation-portal.c \ - gtkprintunixdialog.c \ - gtkprintbackend.c \ - gtksearchenginetracker.c +gtk_os_unix_c_sources = $(gtk_os_unix_c_sources_base) if OS_UNIX -gtk_private_h_sources += \ - gtkiconcachevalidator.h \ - gtkprintbackend.h \ - gtkprinter-private.h \ - gtkprinteroption.h \ - gtkprinteroptionset.h \ - gtkprinteroptionwidget.h \ - gtksearchenginetracker.h +gtk_private_h_sources += $(gtk_os_unix_private_h_sources) if HAVE_TRACKER3 -gtk_private_h_sources += \ - gtksearchenginetracker3.h -gtk_os_unix_c_sources += \ - gtksearchenginetracker3.c +gtk_private_h_sources += $(gtk_os_unix_tracker3_private_h_sources) +gtk_os_unix_c_sources += $(gtk_os_unix_tracker3_c_sources) endif gtk_c_sources += $(gtk_os_unix_c_sources) endif -gtk_os_win32_c_sources = \ - gtkprint-win32.c \ - gtkprintoperation-win32.c \ - gtkfilechoosernativewin32.c \ - gtkwin32.c if OS_WIN32 -gtk_private_h_sources += gtkprint-win32.h +gtk_private_h_sources += $(gtk_os_win32_private_h_sources) gtk_c_sources += $(gtk_os_win32_c_sources) endif -gtk_use_x11_c_sources = \ - gtkplug.c \ - gtksocket.c \ - gtkxembed.c \ - deprecated/gtktrayicon-x11.c \ - gtkapplication-x11.c \ - gtkmountoperation-x11.c - -gtk_use_wayland_c_sources = \ - gtkapplication-wayland.c - -gtk_use_wayland_or_x11_c_sources = \ - gtkapplication-dbus.c - -gtk_use_win32_c_sources = \ - gtkwin32embed.c \ - gtkwin32embedwidget.c \ - gtkmountoperation-stub.c -gtk_use_quartz_c_sources = \ - gtksearchenginequartz.c \ - gtkmountoperation-stub.c \ - gtkapplication-quartz.c \ - gtkapplication-quartz-menu.c \ - gtkfilechoosernativequartz.c \ - gtkquartz.c -gtk_use_stub_c_sources = \ - gtkmountoperation-stub.c -gtk_use_x11_private_h_sources = \ - gtkxembed.h \ - deprecated/gtktrayicon.h \ - xembed.h if USE_X11 gtk_c_sources += $(gtk_use_x11_c_sources) gtk_private_h_sources += $(gtk_use_x11_private_h_sources) @@ -871,17 +195,11 @@ else endif endif -gtk_use_win32_private_h_sources = \ - gtkwin32embed.h \ - gtkwin32embedwidget.h if USE_WIN32 gtk_c_sources += $(gtk_use_win32_c_sources) gtk_private_h_sources += $(gtk_use_win32_private_h_sources) endif -gtk_use_quartz_private_h_sources = \ - gtksearchenginequartz.h \ - gtkquartz.h if USE_QUARTZ gtk_c_sources += $(gtk_use_quartz_c_sources) gtk_private_h_sources += $(gtk_use_quartz_private_h_sources) @@ -909,24 +227,10 @@ endif # depending on them only get rebuild when the built source actually changed # content -# built sources that get installed with the header files -gtk_built_public_sources = \ - gtktypebuiltins.h - -# built headers that don't get installed -gtk_built_private_headers = \ - gtkresources.h \ - gtkmarshalers.h \ - gtkprivatetypebuiltins.h - gtk_built_sources = \ $(gtk_built_private_headers) \ $(gtk_built_public_sources) \ - gtkresources.c \ - gtk.gresource.xml \ - gtktypebuiltins.c \ - gtkmarshalers.c \ - gtkprivatetypebuiltins.c + $(gtk_other_built_sources) nodist_gtk_c_sources += $(gtk_built_sources) @@ -935,18 +239,6 @@ stamp_files = \ stamp-gtktypebuiltins.h \ stamp-gtkprivatetypebuiltins.h -# non-header sources (headers should be specified in the above variables) -# that don't serve as direct make target sources, i.e. they don't have -# their own .lo rules and don't get publically installed -gtk_extra_sources = \ - paper_names.c \ - paper_names_offsets.c \ - gen-paper-names.c \ - deprecated/gtkstatusicon-quartz.c \ - gtkversion.h.in \ - gtkmarshalers.list \ - fallback-c89.c - # # setup GTK+ sources and their dependencies # @@ -978,38 +270,7 @@ EXTRA_DIST += $(its_DATA) templates = \ $(inspector_templates) \ - ui/gtkapplication-quartz.ui \ - ui/gtkaboutdialog.ui \ - ui/gtkactionbar.ui \ - ui/gtkappchooserdialog.ui \ - ui/gtkappchooserwidget.ui \ - ui/gtkassistant.ui \ - ui/gtkcolorchooserdialog.ui \ - ui/gtkcoloreditor.ui \ - ui/gtkcombobox.ui \ - ui/gtkdialog.ui \ - ui/gtkfilechooserbutton.ui \ - ui/gtkemojichooser.ui \ - ui/gtkfilechooserwidget.ui \ - ui/gtkfilechooserdialog.ui \ - ui/gtkfontbutton.ui \ - ui/gtkfontchooserdialog.ui \ - ui/gtkfontchooserwidget.ui \ - ui/gtkinfobar.ui \ - ui/gtklockbutton.ui \ - ui/gtkmessagedialog.ui \ - ui/gtkpagesetupunixdialog.ui \ - ui/gtkpathbar.ui \ - ui/gtkplacesview.ui \ - ui/gtkplacesviewrow.ui \ - ui/gtkprintunixdialog.ui \ - ui/gtkrecentchooserdefault.ui \ - ui/gtksearchbar.ui \ - ui/gtkscalebutton.ui \ - ui/gtkstatusbar.ui \ - ui/gtktooltipwindow.ui \ - ui/gtkvolumebutton.ui \ - ui/gtksidebarrow.ui + $(gtk_base_ui_templates) # # rules to generate built sources @@ -1134,27 +395,12 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc echo " " >> $@; \ echo "" >> $@; -gesture_sources = \ - gesture/gesture-pinch-symbolic.svg \ - gesture/gesture-stretch-symbolic.svg \ - gesture/gesture-rotate-clockwise-symbolic.svg \ - gesture/gesture-rotate-anticlockwise-symbolic.svg \ - gesture/gesture-two-finger-swipe-left-symbolic.svg \ - gesture/gesture-two-finger-swipe-right-symbolic.svg - adwaita_theme_scss = \ - theme/Adwaita/_colors-public.scss \ - theme/Adwaita/_colors.scss \ - theme/Adwaita/_common.scss \ - theme/Adwaita/_drawing.scss \ - theme/Adwaita/gtk-contained-dark.scss \ - theme/Adwaita/gtk-contained.scss \ + $(adwaita_theme_scss_sources) \ $() highcontrast_theme_scss = \ - theme/HighContrast/_colors-hc.scss \ - theme/HighContrast/gtk-contained-inverse.scss \ - theme/HighContrast/gtk-contained.scss \ + $(highcontrast_theme_scss_sources) \ $() if REBUILD_SCSS @@ -1182,21 +428,11 @@ theme/HighContrast/gtk-contained-inverse.css: $(top_srcdir)/gtk/theme/HighContra endif # REBUILD_SCSS theme_sources = \ - theme/win32/gtk.css \ - theme/win32/gtk-win32-base.css \ + $(win32_theme_css_sources) \ $(adwaita_theme_scss) \ - theme/Adwaita/assets.txt \ - theme/Adwaita/assets.svg \ - theme/Adwaita/README \ - theme/Adwaita/gtk-contained.css \ - theme/Adwaita/gtk-contained-dark.css \ - theme/Adwaita/gtk.css \ - theme/Adwaita/gtk-dark.css \ + $(adwaita_theme_files) \ $(highcontrast_theme_scss) \ - theme/HighContrast/gtk-contained.css \ - theme/HighContrast/gtk-contained-inverse.css \ - theme/HighContrast/gtk.css \ - theme/HighContrast/gtk-inverse.css + $(highcontrast_theme_css_sources) resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gtk.gresource.xml) diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc index 86c38f925c..91e511bf63 100644 --- a/gtk/gtk-sources.inc +++ b/gtk/gtk-sources.inc @@ -234,3 +234,827 @@ GTK_PUB_HDRS = \ GTK_PRIVATE_TYPE_HDRS = \ gtkcsstypesprivate.h \ gtktexthandleprivate.h + +GTK_UNIX_PRINT_PUB_HDRS = \ + gtkpagesetupunixdialog.h \ + gtkprintunixdialog.h \ + gtkprinter.h \ + gtkprintjob.h \ + gtkunixprint-autocleanups.h \ + gtkunixprint.h + +# Installed header files without compatibility guarantees +# that are not included in gtk/gtk.h +gtk_semi_private_h_sources = \ + gtktextlayout.h + +# Base non-generated private headers +gtk_base_private_h_sources = \ + gtkactionmuxer.h \ + gtkactionobserver.h \ + gtkactionobservable.h \ + gtkadjustmentprivate.h \ + gtkapplicationaccelsprivate.h \ + gtkapplicationprivate.h \ + gtkaccelgroupprivate.h \ + gtkaccelmapprivate.h \ + gtkactionhelper.h \ + gtkallocatedbitmaskprivate.h \ + gtkappchooserprivate.h \ + gtkbindingsprivate.h \ + gtkbitmaskprivate.h \ + gtkbitmaskprivateimpl.h \ + gtkbookmarksmanager.h \ + gtkboxprivate.h \ + gtkboxgadgetprivate.h \ + gtkbuilderprivate.h \ + gtkbuiltiniconprivate.h \ + gtkbuttonprivate.h \ + gtkcairoblurprivate.h \ + gtkcellareaboxcontextprivate.h \ + gtkcheckbuttonprivate.h \ + gtkcheckmenuitemprivate.h \ + gtkclipboardprivate.h \ + gtkcolorswatchprivate.h \ + gtkcoloreditorprivate.h \ + gtkcolorpickerprivate.h \ + gtkcolorpickerkwinprivate.h \ + gtkcolorpickerportalprivate.h \ + gtkcolorpickershellprivate.h \ + gtkcolorplaneprivate.h \ + gtkcolorscaleprivate.h \ + gtkcolorchooserprivate.h \ + gtkcomboboxprivate.h \ + gtkcomposetable.h \ + gtkcontainerprivate.h \ + gtkcssanimationprivate.h \ + gtkcssanimatedstyleprivate.h \ + gtkcssarrayvalueprivate.h \ + gtkcssbgsizevalueprivate.h \ + gtkcssbordervalueprivate.h \ + gtkcsscalcvalueprivate.h \ + gtkcsscolorvalueprivate.h \ + gtkcsscornervalueprivate.h \ + gtkcsscustomgadgetprivate.h \ + gtkcsscustompropertyprivate.h \ + gtkcssdimensionvalueprivate.h \ + gtkcsseasevalueprivate.h \ + gtkcssenginevalueprivate.h \ + gtkcssenumvalueprivate.h \ + gtkcssgadgetprivate.h \ + gtkcssiconthemevalueprivate.h \ + gtkcssimagebuiltinprivate.h \ + gtkcssimagecrossfadeprivate.h \ + gtkcssimagefallbackprivate.h \ + gtkcssimagegradientprivate.h \ + gtkcssimageiconthemeprivate.h \ + gtkcssimagelinearprivate.h \ + gtkcssimageradialprivate.h \ + gtkcssimageprivate.h \ + gtkcssimagesurfaceprivate.h \ + gtkcssimageurlprivate.h \ + gtkcssimagerecolorprivate.h \ + gtkcssimagescaledprivate.h \ + gtkcssimagevalueprivate.h \ + gtkcssimagewin32private.h \ + gtkcssinheritvalueprivate.h \ + gtkcssinitialvalueprivate.h \ + gtkcsskeyframesprivate.h \ + gtkcsslookupprivate.h \ + gtkcssmatcherprivate.h \ + gtkcssnodeprivate.h \ + gtkcssnodedeclarationprivate.h \ + gtkcssnodestylecacheprivate.h \ + gtkcssnumbervalueprivate.h \ + gtkcsspalettevalueprivate.h \ + gtkcssparserprivate.h \ + gtkcsspathnodeprivate.h \ + gtkcsspositionvalueprivate.h \ + gtkcssproviderprivate.h \ + gtkcssrepeatvalueprivate.h \ + gtkcssrgbavalueprivate.h \ + gtkcsssectionprivate.h \ + gtkcssselectorprivate.h \ + gtkcssshadowsvalueprivate.h \ + gtkcssshadowvalueprivate.h \ + gtkcssshorthandpropertyprivate.h \ + gtkcssstaticstyleprivate.h \ + gtkcssstringvalueprivate.h \ + gtkcssstylefuncsprivate.h \ + gtkcssstylechangeprivate.h \ + gtkcssstyleprivate.h \ + gtkcssstylepropertyprivate.h \ + gtkcsstransformvalueprivate.h \ + gtkcsstransientnodeprivate.h \ + gtkcsstransitionprivate.h \ + gtkcsstypedvalueprivate.h \ + gtkcssunsetvalueprivate.h \ + gtkcssvalueprivate.h \ + gtkcsswin32sizevalueprivate.h \ + gtkcsswidgetnodeprivate.h \ + gtkcustompaperunixdialog.h \ + gtkdialogprivate.h \ + gtkdndprivate.h \ + gtkemojichooser.h \ + gtkemojicompletion.h \ + gtkentryprivate.h \ + gtkeventcontrollerprivate.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ + gtkfilechooserprivate.h \ + gtkfilechoosernativeprivate.h \ + gtkfilechooserwidgetprivate.h \ + gtkfilechooserutils.h \ + gtkfilefilterprivate.h \ + gtkfilesystem.h \ + gtkfilesystemmodel.h \ + gtkfontchooserprivate.h \ + gtkfontchooserutils.h \ + gtkfontchooserwidgetprivate.h \ + gtkgestureprivate.h \ + gtkgesturedragprivate.h \ + gtkgesturelongpressprivate.h \ + gtkgesturemultipressprivate.h \ + gtkgesturepanprivate.h \ + gtkgesturerotateprivate.h \ + gtkgesturesingleprivate.h \ + gtkgesturestylusprivate.h \ + gtkgestureswipeprivate.h \ + gtkgesturezoomprivate.h \ + gtkheaderbarprivate.h \ + gtkhslaprivate.h \ + gtkiconcache.h \ + gtkiconhelperprivate.h \ + gtkiconprivate.h \ + gtkiconthemeprivate.h \ + gtkiconviewprivate.h \ + gtkimagedefinitionprivate.h \ + gtkimageprivate.h \ + gtkimmoduleprivate.h \ + gtkimcontextsimpleseqs.h \ + gtkintl.h \ + gtkkeyhash.h \ + gtkkineticscrolling.h \ + gtklabelprivate.h \ + gtklockbuttonprivate.h \ + gtkmagnifierprivate.h \ + gtkmenubuttonprivate.h \ + gtkmenuprivate.h \ + gtkmenuitemprivate.h \ + gtkmenusectionbox.h \ + gtkmenushellprivate.h \ + gtkmenutracker.h \ + gtkmenutrackeritem.h \ + gtkmnemonichash.h \ + gtkmodelmenuitem.h \ + gtkmodifierstyle.h \ + gtkmodulesprivate.h \ + gtkmountoperationprivate.h \ + gtknativedialogprivate.h \ + gtkorientableprivate.h \ + gtkpango.h \ + gtkpathbar.h \ + gtkplacessidebarprivate.h \ + gtkplacesviewprivate.h \ + gtkplacesviewrowprivate.h \ + gtkpopoverprivate.h \ + gtkprintoperation-private.h \ + gtkprintutils.h \ + gtkprivate.h \ + gtkpixelcacheprivate.h \ + gtkprogresstrackerprivate.h \ + gtkquery.h \ + gtkrangeprivate.h \ + gtkrbtree.h \ + gtkrecentchooserdefault.h \ + gtkrecentchooserprivate.h \ + gtkrecentchooserutils.h \ + gtkrenderbackgroundprivate.h \ + gtkrenderborderprivate.h \ + gtkrendericonprivate.h \ + gtkrenderprivate.h \ + gtkresources.h \ + gtkroundedboxprivate.h \ + gtksearchengine.h \ + gtksearchenginesimple.h \ + gtksearchenginemodel.h \ + gtksearchentryprivate.h \ + gtkselectionprivate.h \ + gtksettingsprivate.h \ + gtkshortcutswindowprivate.h \ + gtkshortcutsshortcutprivate.h \ + gtksidebarrowprivate.h \ + gtksizegroup-private.h \ + gtksizerequestcacheprivate.h \ + gtksocketprivate.h \ + gtkstyleanimationprivate.h \ + gtkstylecascadeprivate.h \ + gtkstylecontextprivate.h \ + gtkstylepropertyprivate.h \ + gtkstyleproviderprivate.h \ + gtktextattributesprivate.h \ + gtktextbtree.h \ + gtktextbufferprivate.h \ + gtktextbufferserialize.h \ + gtktextchildprivate.h \ + gtktexthandleprivate.h \ + gtktextiterprivate.h \ + gtktextmarkprivate.h \ + gtktextsegment.h \ + gtktexttagprivate.h \ + gtktexttagtableprivate.h \ + gtktexttypes.h \ + gtktextutil.h \ + gtktrashmonitor.h \ + gtktogglebuttonprivate.h \ + gtktoolbarprivate.h \ + gtktoolpaletteprivate.h \ + gtktooltipprivate.h \ + gtktooltipwindowprivate.h \ + gtktreedatalist.h \ + gtktreeprivate.h \ + gtkutilsprivate.h \ + gtkwidgetprivate.h \ + gtkwidgetpathprivate.h \ + gtkwin32drawprivate.h \ + gtkwin32themeprivate.h \ + gtkwindowprivate.h \ + gtktreemenu.h \ + gdkpixbufutilsprivate.h \ + open-type-layout.h \ + language-names.h \ + script-names.h + +# GTK base sources +gtk_base_c_sources_base = \ + gtkactionmuxer.c \ + gtkactionobserver.c \ + gtkactionobservable.c \ + gtkactionable.c \ + gtkquery.c \ + gtksearchbar.c \ + gtksearchentry.c \ + gtksearchengine.c \ + gtksearchenginesimple.c \ + gtksearchenginemodel.c \ + fnmatch.c \ + gtkaboutdialog.c \ + gtkaccelgroup.c \ + gtkaccellabel.c \ + gtkaccelmap.c \ + gtkaccessible.c \ + gtkactionbar.c \ + gtkactionhelper.c \ + gtkadjustment.c \ + gtkallocatedbitmask.c \ + gtkappchooser.c \ + gtkappchooserwidget.c \ + gtkappchooserbutton.c \ + gtkappchooserdialog.c \ + gtkapplication.c \ + gtkapplicationaccels.c \ + gtkapplicationimpl.c \ + gtkapplicationwindow.c \ + gtkaspectframe.c \ + gtkassistant.c \ + gtkbbox.c \ + gtkbin.c \ + gtkbindings.c \ + gtkbookmarksmanager.c \ + gtkborder.c \ + gtkbox.c \ + gtkboxgadget.c \ + gtkbuildable.c \ + gtkbuilder.c \ + gtkbuilderparser.c \ + gtkbuilder-menus.c \ + gtkbuiltinicon.c \ + gtkbutton.c \ + gtkcairoblur.c \ + gtkcalendar.c \ + gtkcellarea.c \ + gtkcellareabox.c \ + gtkcellareaboxcontext.c \ + gtkcellareacontext.c \ + gtkcelleditable.c \ + gtkcelllayout.c \ + gtkcellrenderer.c \ + gtkcellrendereraccel.c \ + gtkcellrenderercombo.c \ + gtkcellrendererpixbuf.c \ + gtkcellrendererprogress.c \ + gtkcellrendererspin.c \ + gtkcellrendererspinner.c \ + gtkcellrenderertext.c \ + gtkcellrenderertoggle.c \ + gtkcellview.c \ + gtkcheckbutton.c \ + gtkcheckmenuitem.c \ + gtkcolorbutton.c \ + gtkcolorchooser.c \ + gtkcolorchooserwidget.c \ + gtkcolorchooserdialog.c \ + gtkcoloreditor.c \ + gtkcolorpicker.c \ + gtkcolorpickerkwin.c \ + gtkcolorpickerportal.c \ + gtkcolorpickershell.c \ + gtkcolorplane.c \ + gtkcolorscale.c \ + gtkcolorswatch.c \ + gtkcolorutils.c \ + gtkcombobox.c \ + gtkcomboboxtext.c \ + gtkcomposetable.c \ + gtkcontainer.c \ + gtkcssanimation.c \ + gtkcssanimatedstyle.c \ + gtkcssarrayvalue.c \ + gtkcssbgsizevalue.c \ + gtkcssbordervalue.c \ + gtkcsscalcvalue.c \ + gtkcsscolorvalue.c \ + gtkcsscornervalue.c \ + gtkcsscustomgadget.c \ + gtkcsscustomproperty.c \ + gtkcssdimensionvalue.c \ + gtkcsseasevalue.c \ + gtkcssenumvalue.c \ + gtkcssenginevalue.c \ + gtkcssgadget.c \ + gtkcssiconthemevalue.c \ + gtkcssimage.c \ + gtkcssimagebuiltin.c \ + gtkcssimagecrossfade.c \ + gtkcssimagefallback.c \ + gtkcssimagegradient.c \ + gtkcssimageicontheme.c \ + gtkcssimagelinear.c \ + gtkcssimageradial.c \ + gtkcssimagesurface.c \ + gtkcssimageurl.c \ + gtkcssimagerecolor.c \ + gtkcssimagescaled.c \ + gtkcssimagevalue.c \ + gtkcssimagewin32.c \ + gtkcssinheritvalue.c \ + gtkcssinitialvalue.c \ + gtkcsskeyframes.c \ + gtkcsslookup.c \ + gtkcssmatcher.c \ + gtkcssnode.c \ + gtkcssnodedeclaration.c \ + gtkcssnodestylecache.c \ + gtkcssnumbervalue.c \ + gtkcsspalettevalue.c \ + gtkcssparser.c \ + gtkcsspathnode.c \ + gtkcsspositionvalue.c \ + gtkcssprovider.c \ + gtkcssrepeatvalue.c \ + gtkcssrgbavalue.c \ + gtkcsssection.c \ + gtkcssselector.c \ + gtkcssstringvalue.c \ + gtkcssstyle.c \ + gtkcssstylechange.c \ + gtkcssshadowsvalue.c \ + gtkcssshadowvalue.c \ + gtkcssshorthandproperty.c \ + gtkcssshorthandpropertyimpl.c \ + gtkcssstaticstyle.c \ + gtkcssstylefuncs.c \ + gtkcssstyleproperty.c \ + gtkcssstylepropertyimpl.c \ + gtkcsstransformvalue.c \ + gtkcsstransientnode.c \ + gtkcsstransition.c \ + gtkcsstypedvalue.c \ + gtkcssunsetvalue.c \ + gtkcsstypes.c \ + gtkcssvalue.c \ + gtkcsswidgetnode.c \ + gtkcsswin32sizevalue.c \ + gtkdialog.c \ + gtkdragsource.c \ + gtkdrawingarea.c \ + gtkeditable.c \ + gtkemojichooser.c \ + gtkemojicompletion.c \ + gtkentry.c \ + gtkentrybuffer.c \ + gtkentrycompletion.c \ + gtkeventbox.c \ + gtkeventcontroller.c \ + gtkeventcontrollerkey.c \ + gtkeventcontrollermotion.c \ + gtkeventcontrollerscroll.c \ + gtkexpander.c \ + gtkfilechooser.c \ + gtkfilechooserbutton.c \ + gtkfilechooserdialog.c \ + gtkfilechooserembed.c \ + gtkfilechooserentry.c \ + gtkfilechoosernative.c \ + gtkfilechoosernativeportal.c \ + gtkfilechooserutils.c \ + gtkfilechooserwidget.c \ + gtkfilefilter.c \ + gtkfilesystem.c \ + gtkfilesystemmodel.c \ + gtkfixed.c \ + gtkflowbox.c \ + gtkfontbutton.c \ + gtkfontchooser.c \ + gtkfontchooserdialog.c \ + gtkfontchooserutils.c \ + gtkfontchooserwidget.c \ + gtkframe.c \ + gtkgladecatalog.c \ + gtkgesture.c \ + gtkgesturedrag.c \ + gtkgesturelongpress.c \ + gtkgesturemultipress.c \ + gtkgesturepan.c \ + gtkgesturerotate.c \ + gtkgesturesingle.c \ + gtkgesturestylus.c \ + gtkgestureswipe.c \ + gtkgesturezoom.c \ + gtkglarea.c \ + gtkgrid.c \ + gtkheaderbar.c \ + gtkhsla.c \ + gtkicon.c \ + gtkiconcache.c \ + gtkiconcachevalidator.c \ + gtkiconhelper.c \ + gtkicontheme.c \ + gtkiconview.c \ + gtkimage.c \ + gtkimagedefinition.c \ + gtkimcontext.c \ + gtkimcontextsimple.c \ + gtkimmodule.c \ + gtkimmulticontext.c \ + gtkinfobar.c \ + gtkinvisible.c \ + gtkkeyhash.c \ + gtkkineticscrolling.c \ + gtklabel.c \ + gtklayout.c \ + gtklevelbar.c \ + gtklinkbutton.c \ + gtklistbox.c \ + gtkliststore.c \ + gtklockbutton.c \ + gtkmain.c \ + gtkmagnifier.c \ + gtkmenu.c \ + gtkmenubar.c \ + gtkmenubutton.c \ + gtkmenuitem.c \ + gtkmenusectionbox.c \ + gtkmenushell.c \ + gtkmenutracker.c \ + gtkmenutrackeritem.c \ + gtkmenutoolbutton.c \ + gtkmessagedialog.c \ + gtkmnemonichash.c \ + gtkmodelmenuitem.c \ + gtkmodelbutton.c \ + gtkmodifierstyle.c \ + gtkmodules.c \ + gtkmountoperation.c \ + gtknativedialog.c \ + gtknotebook.c \ + gtkoffscreenwindow.c \ + gtkorientable.c \ + gtkoverlay.c \ + gtkpadcontroller.c \ + gtkpagesetup.c \ + gtkpaned.c \ + gtkpango.c \ + gtkpapersize.c \ + gtkpathbar.c \ + gtkplacessidebar.c \ + gtkplacesview.c \ + gtkplacesviewrow.c \ + gtkprintcontext.c \ + gtkprintoperation.c \ + gtkprintoperationpreview.c \ + gtkprintsettings.c \ + gtkprintutils.c \ + gtkprivate.c \ + gtkprogressbar.c \ + gtkprogresstracker.c \ + gtkpixelcache.c \ + gtkpopover.c \ + gtkpopovermenu.c \ + gtkradiobutton.c \ + gtkradiomenuitem.c \ + gtkradiotoolbutton.c \ + gtkrange.c \ + gtkrbtree.c \ + gtkrecentchooserdefault.c \ + gtkrecentchooserdialog.c \ + gtkrecentchoosermenu.c \ + gtkrecentchooserwidget.c \ + gtkrecentchooserutils.c \ + gtkrecentchooser.c \ + gtkrecentfilter.c \ + gtkrecentmanager.c \ + gtkrender.c \ + gtkrenderbackground.c \ + gtkrenderborder.c \ + gtkrendericon.c \ + gtkrevealer.c \ + gtkroundedbox.c \ + gtkscale.c \ + gtkscalebutton.c \ + gtkscrollable.c \ + gtkscrollbar.c \ + gtkscrolledwindow.c \ + gtkselection.c \ + gtkseparator.c \ + gtkseparatormenuitem.c \ + gtkseparatortoolitem.c \ + gtksettings.c \ + gtkshortcutsgroup.c \ + gtkshortcutlabel.c \ + gtkshortcutsshortcut.c \ + gtkshortcutssection.c \ + gtkshortcutswindow.c \ + gtksidebarrow.c \ + gtksizegroup.c \ + gtksizerequest.c \ + gtksizerequestcache.c \ + gtkshow.c \ + gtkstacksidebar.c \ + gtkspinbutton.c \ + gtkspinner.c \ + gtkstack.c \ + gtkstackswitcher.c \ + gtkstatusbar.c \ + gtkstyleanimation.c \ + gtkstylecascade.c \ + gtkstylecontext.c \ + gtkstyleproperty.c \ + gtkstyleprovider.c \ + gtkstyleproviderprivate.c \ + gtkswitch.c \ + gtktestutils.c \ + gtktextattributes.c \ + gtktextbtree.c \ + gtktextbuffer.c \ + gtktextbufferrichtext.c \ + gtktextbufferserialize.c \ + gtktextchild.c \ + gtktextdisplay.c \ + gtktexthandle.c \ + gtktextiter.c \ + gtktextlayout.c \ + gtktextmark.c \ + gtktextsegment.c \ + gtktexttag.c \ + gtktexttagtable.c \ + gtktexttypes.c \ + gtktextutil.c \ + gtktextview.c \ + gtktogglebutton.c \ + gtktoggletoolbutton.c \ + gtktoolbar.c \ + gtktoolbutton.c \ + gtktoolitem.c \ + gtktoolitemgroup.c \ + gtktoolpalette.c \ + gtktoolshell.c \ + gtktooltip.c \ + gtktooltipwindow.c \ + gtktrashmonitor.c \ + gtktreedatalist.c \ + gtktreednd.c \ + gtktreemenu.c \ + gtktreemodel.c \ + gtktreemodelfilter.c \ + gtktreemodelsort.c \ + gtktreeselection.c \ + gtktreesortable.c \ + gtktreestore.c \ + gtktreeview.c \ + gtktreeviewcolumn.c \ + gtkutils.c \ + gtkvolumebutton.c \ + gtkviewport.c \ + gtkwidget.c \ + gtkwidgetpath.c \ + gtkwindow.c \ + gtkwindowgroup.c \ + gtkwin32draw.c \ + gtkwin32theme.c \ + gdkpixbufutils.c \ + language-names.c \ + script-names.c + +# Clipboard/dnd platform-specific sources +gtk_clipboard_dnd_c_sources_quartz = \ + gtkclipboard-quartz.c \ + gtkdnd-quartz.c + +gtk_clipboard_dnd_c_sources_generic = \ + gtkclipboard.c \ + gtkdnd.c \ + gtkdragdest.c + +# Stub sources +gtk_use_stub_c_sources = \ + gtkmountoperation-stub.c + +# Base platform-specific sources +gtk_os_unix_c_sources_base = \ + gtkcustompaperunixdialog.c \ + gtkpagesetupunixdialog.c \ + gtkprinter.c \ + gtkprinteroption.c \ + gtkprinteroptionset.c \ + gtkprinteroptionwidget.c \ + gtkprintjob.c \ + gtkprintoperation-unix.c \ + gtkprintoperation-portal.h \ + gtkprintoperation-portal.c \ + gtkprintunixdialog.c \ + gtkprintbackend.c \ + gtksearchenginetracker.c + +gtk_os_unix_private_h_sources = \ + gtkiconcachevalidator.h \ + gtkprintbackend.h \ + gtkprinter-private.h \ + gtkprinteroption.h \ + gtkprinteroptionset.h \ + gtkprinteroptionwidget.h \ + gtksearchenginetracker.h + +gtk_os_unix_tracker3_private_h_sources = gtksearchenginetracker3.h +gtk_os_unix_tracker3_c_sources = gtksearchenginetracker3.c + +gtk_use_wayland_c_sources = \ + gtkapplication-wayland.c + +gtk_use_wayland_or_x11_c_sources = \ + gtkapplication-dbus.c + +gtk_use_x11_c_sources = \ + gtkplug.c \ + gtksocket.c \ + gtkxembed.c \ + deprecated/gtktrayicon-x11.c \ + gtkapplication-x11.c \ + gtkmountoperation-x11.c + +gtk_use_x11_private_h_sources = \ + gtkxembed.h \ + deprecated/gtktrayicon.h \ + xembed.h + +gtk_os_win32_c_sources = \ + gtkprint-win32.c \ + gtkprintoperation-win32.c \ + gtkfilechoosernativewin32.c \ + gtkwin32.c + +gtk_os_win32_private_h_sources = gtkprint-win32.h + +gtk_use_win32_private_h_sources = \ + gtkwin32embed.h \ + gtkwin32embedwidget.h + +gtk_use_win32_c_sources = \ + gtkwin32embed.c \ + gtkwin32embedwidget.c \ + $(gtk_use_stub_c_sources) + +gtk_use_quartz_c_sources = \ + gtksearchenginequartz.c \ + $(gtk_use_stub_c_sources) \ + gtkapplication-quartz.c \ + gtkapplication-quartz-menu.c \ + gtkfilechoosernativequartz.c \ + gtkquartz.c + +gtk_use_quartz_private_h_sources = \ + gtksearchenginequartz.h \ + gtkquartz.h + +# Generated sources +# built sources that get installed with the header files +gtk_built_public_sources = \ + gtktypebuiltins.h + +# built headers that don't get installed +gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h + +gtk_built_private_headers = \ + gtkresources.h \ + gtkmarshalers.h \ + gtkprivatetypebuiltins.h + +gtk_other_built_sources = \ + gtkresources.c \ + gtk.gresource.xml \ + gtktypebuiltins.c \ + gtkmarshalers.c \ + gtkprivatetypebuiltins.c + +# non-header sources (headers should be specified in the above variables) +# that don't serve as direct make target sources, i.e. they don't have +# their own .lo rules and don't get publically installed +gtk_extra_sources = \ + paper_names.c \ + paper_names_offsets.c \ + gen-paper-names.c \ + deprecated/gtkstatusicon-quartz.c \ + gtkversion.h.in \ + gtkmarshalers.list \ + fallback-c89.c + +# Resources +# Base UI templates +gtk_base_ui_templates = \ + ui/gtkapplication-quartz.ui \ + ui/gtkaboutdialog.ui \ + ui/gtkactionbar.ui \ + ui/gtkappchooserdialog.ui \ + ui/gtkappchooserwidget.ui \ + ui/gtkassistant.ui \ + ui/gtkcolorchooserdialog.ui \ + ui/gtkcoloreditor.ui \ + ui/gtkcombobox.ui \ + ui/gtkdialog.ui \ + ui/gtkfilechooserbutton.ui \ + ui/gtkemojichooser.ui \ + ui/gtkfilechooserwidget.ui \ + ui/gtkfilechooserdialog.ui \ + ui/gtkfontbutton.ui \ + ui/gtkfontchooserdialog.ui \ + ui/gtkfontchooserwidget.ui \ + ui/gtkinfobar.ui \ + ui/gtklockbutton.ui \ + ui/gtkmessagedialog.ui \ + ui/gtkpagesetupunixdialog.ui \ + ui/gtkpathbar.ui \ + ui/gtkplacesview.ui \ + ui/gtkplacesviewrow.ui \ + ui/gtkprintunixdialog.ui \ + ui/gtkrecentchooserdefault.ui \ + ui/gtksearchbar.ui \ + ui/gtkscalebutton.ui \ + ui/gtkstatusbar.ui \ + ui/gtktooltipwindow.ui \ + ui/gtkvolumebutton.ui \ + ui/gtksidebarrow.ui + +gesture_sources = \ + gesture/gesture-pinch-symbolic.svg \ + gesture/gesture-stretch-symbolic.svg \ + gesture/gesture-rotate-clockwise-symbolic.svg \ + gesture/gesture-rotate-anticlockwise-symbolic.svg \ + gesture/gesture-two-finger-swipe-left-symbolic.svg \ + gesture/gesture-two-finger-swipe-right-symbolic.svg + +adwaita_theme_css_sources = \ + theme/Adwaita/gtk-contained.css \ + theme/Adwaita/gtk-contained-dark.css \ + theme/Adwaita/gtk.css \ + theme/Adwaita/gtk-dark.css + +adwaita_theme_scss_sources = \ + theme/Adwaita/_colors-public.scss \ + theme/Adwaita/_colors.scss \ + theme/Adwaita/_common.scss \ + theme/Adwaita/_drawing.scss \ + theme/Adwaita/gtk-contained-dark.scss \ + theme/Adwaita/gtk-contained.scss + +adwaita_theme_files = \ + theme/Adwaita/assets.txt \ + theme/Adwaita/assets.svg \ + theme/Adwaita/README \ + $(adwaita_theme_css_sources) + +highcontrast_theme_css_sources = \ + theme/HighContrast/gtk-contained.css \ + theme/HighContrast/gtk-contained-inverse.css \ + theme/HighContrast/gtk.css \ + theme/HighContrast/gtk-inverse.css + +highcontrast_theme_scss_sources = \ + theme/HighContrast/_colors-hc.scss \ + theme/HighContrast/gtk-contained-inverse.scss \ + theme/HighContrast/gtk-contained.scss + +win32_theme_css_sources = \ + theme/win32/gtk.css \ + theme/win32/gtk-win32-base.css + + From ea3b599d7fe1135ad9c9b32d11b73a6c73b3b848 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 12:06:00 +0800 Subject: [PATCH 05/21] libgail-util: Split out sources listings We want to share the listings with other non-autotools build systems. --- libgail-util/Makefile.am | 10 +--------- libgail-util/libgail-util-sources.inc | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 libgail-util/libgail-util-sources.inc diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am index cfeb366060..aa2f93adcb 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.decl +include libgail-util-sources.inc EXTRA_DIST += \ gailutil.def \ @@ -35,17 +36,8 @@ endif lib_LTLIBRARIES = libgailutil-3.la -util_c_sources = \ - gailmisc.c \ - gailtextutil.c - libgailutilincludedir=$(includedir)/gail-3.0/libgail-util -util_public_h_sources = \ - gailmisc.h \ - gailtextutil.h \ - gail-util.h - libgailutil_3_la_SOURCES = \ $(util_c_sources) diff --git a/libgail-util/libgail-util-sources.inc b/libgail-util/libgail-util-sources.inc new file mode 100644 index 0000000000..4f71e1aa62 --- /dev/null +++ b/libgail-util/libgail-util-sources.inc @@ -0,0 +1,10 @@ +# Source listings for libgail-util + +util_c_sources = \ + gailmisc.c \ + gailtextutil.c + +util_public_h_sources = \ + gailmisc.h \ + gailtextutil.h \ + gail-util.h From 8477c0e76539587429a4b1b3f8065a0c9ef05532 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 12:32:03 +0800 Subject: [PATCH 06/21] win32/create-lists-msvc.mak: Clean up a bit We now have the theme CSS source listings in gtk/gtk-sources.inc, so make use of it. No need to repeat items from there. --- win32/create-lists-msvc.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index 02eada540e..a7efbadc12 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -97,19 +97,19 @@ NULL= # For GTK resources -!if [for %f in (..\gtk\theme\Adwaita\gtk.css ..\gtk\theme\Adwaita\gtk-dark.css ..\gtk\theme\Adwaita\gtk-contained.css ..\gtk\theme\Adwaita\gtk-contained-dark.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in ($(adwaita_theme_css_sources:/=\)) do @call create-lists.bat file resources_sources.mak ..\gtk\%f] !endif !if [for %x in (png svg) do @(for %f in (..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] !endif -!if [for %f in (..\gtk\theme\HighContrast\gtk.css ..\gtk\theme\HighContrast\gtk-inverse.css ..\gtk\theme\HighContrast\gtk-contained.css ..\gtk\theme\HighContrast\gtk-contained-inverse.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in ($(highcontrast_theme_css_sources:/=\)) do @call create-lists.bat file resources_sources.mak ..\gtk\%f] !endif !if [for %x in (png svg) do @(for %f in (..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] !endif -!if [for %f in (..\gtk\theme\win32\gtk-win32-base.css ..\gtk\theme\win32\gtk.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in ($(win32_theme_css_sources:/=\)) do @call create-lists.bat file resources_sources.mak ..\gtk\%f] !endif !if [for %f in (..\gtk\cursor\*.png ..\gtk\gesture\*.symbolic.png ..\gtk\ui\*.ui) do @call create-lists.bat file resources_sources.mak %f] From 331090c14879a905bf76d29e9d919279720dc415 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 12:35:40 +0800 Subject: [PATCH 07/21] win32/create-lists-msvc.mak: Pull in the newly-split source listings We are going to use them to help us to use an NMake Makefile to copy the built files and headers in our "install" directory. --- win32/create-lists-msvc.mak | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index a7efbadc12..3763342b76 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -45,6 +45,12 @@ NULL= !if [call create-lists.bat footer gdk_headers.mak] !endif +# For GDK-Win32 public headers +!include ..\gdk\win32\gdk-win32-sources.inc + +# For GDK-Broadway public headers +!include ..\gdk\broadway\gdk-broadway-sources.inc + !include gdk_headers.mak !if [del /f /q gdk_headers.mak] @@ -95,6 +101,9 @@ NULL= !if [del /f /q gtk_headers.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 resources_sources.mak ..\gtk\%f] From 3b5b8bbebe7c37794aeae2ce66d452b93e2149c7 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 16:20:37 +0800 Subject: [PATCH 08/21] win32/: Add install-msvc.mak This is an NMake Makefile that will replace the property sheets in the Visual Studio project files so that we can call it from the project files to "install" the binaries and introspection files that were built, along with the header files and other data files, which aims to be easier to maintain for the current approach. This will also be expanded upon to optionally build the translation files and make the installed files more in-line with what are done in the Meson build files, where there could be compatibility problems with older Visual Studio toolchains. --- win32/config-msvc.mak.in | 8 ++- win32/install-msvc.mak | 126 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 win32/install-msvc.mak diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in index 296235e975..c39d7170b0 100644 --- a/win32/config-msvc.mak.in +++ b/win32/config-msvc.mak.in @@ -38,12 +38,18 @@ GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen !endif +!ifndef GLIB_COMPILE_SCHEMAS +GLIB_COMPILE_SCHEMAS = $(PREFIX)\bin\glib-compile-schemas.exe +!endif + !if "$(PLAT)" == "x64" AT_PLAT=x86_64 !elseif "$(PLAT)" == "arm64" AT_PLAT=aarch64 -!else +!elseif "$(PLAT)" == "Win32" AT_PLAT=i686 +!else +AT_PLAT=unknown !endif demo_sources = $(demos_base) diff --git a/win32/install-msvc.mak b/win32/install-msvc.mak new file mode 100644 index 0000000000..4bd136feb4 --- /dev/null +++ b/win32/install-msvc.mak @@ -0,0 +1,126 @@ +# NMake Makefile portion for copying the built files to directories as appropriate +# under $(PREFIX) + +!include config-msvc.mak +!include create-lists-msvc.mak + +GTK_API_VERSION = 3 +BASE_BUILT_BIN_DIR = .\vs$(VSVER)\$(CFG)\$(PLAT)\bin + +!ifdef BROADWAY +GDK_OUTPUT_CONFIGDIR = $(CFG)_Broadway +GDK_BROADWAY_BIN = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\broadwayd.exe +GDK_BROADWAY_PDB = $(GDK_BROADWAY_BIN:.exe=.pdb) +GEN_PC_BROADWAY_FLAG = --broadway +!else +GDK_OUTPUT_CONFIGDIR = $(CFG) +GDK_BROADWAY_BIN = +GDK_BROADWAY_PDB = +GEN_PC_BROADWAY_FLAG = +!endif + +IMPLIB_SUFFIX = $(GTK_API_VERSION).0.lib +GDK_DLL = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\gdk-$(GTK_API_VERSION)-vs$(VSVER).dll +GDK_PDB = $(GDK_DLL:.dll=.pdb) +GDK_LIB = .\vs$(VSVER)\$(GDK_OUTPUT_CONFIGDIR)\$(PLAT)\bin\gdk-$(IMPLIB_SUFFIX) +GDK_BIN_ITEMS = $(GDK_DLL) $(GDK_PDB) $(GDK_BROADWAY_BIN) $(GDK_BROADWAY_PDB) +GTK_DLL_FILENAME = gtk-$(GTK_API_VERSION)-vs$(VSVER) +GTK_LIB = $(BASE_BUILT_BIN_DIR)\gtk-$(IMPLIB_SUFFIX) +LIBGAIL_UTIL_DLL_FILENAME = gailutil-$(GTK_API_VERSION)-vs$(VSVER) +LIBGAIL_UTIL_LIB = $(BASE_BUILT_BIN_DIR)\gailutil-$(IMPLIB_SUFFIX) +GTK_PROGRAMS_NAMES = builder-tool encode-symbolic-svg query-settings update-icon-cache +GTK3_PROGRAMS_NAMES = demo demo-application icon-browser +GDK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gdk-$(IMPLIB_SUFFIX:.lib=.gir) +GDKWIN32_GIR_FILE = $(BASE_BUILT_BIN_DIR)\GdkWin32-$(IMPLIB_SUFFIX:.lib=.gir) +GTK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gtk-$(IMPLIB_SUFFIX:.lib=.gir) +GDK_TYPELIB_FILE = $(GDK_GIR_FILE:.gir=.typelib) +GDKWIN32_TYPELIB_FILE = $(GDKWIN32_GIR_FILE:.gir=.typelib) +GTK_TYPELIB_FILE = $(GTK_GIR_FILE:.gir=.typelib) + +GTK_HEADERS_BASE_INSTALL_DIR = $(PREFIX)\include\gtk-$(GTK_API_VERSION).0 +GAILUTIL_HEADERS_BASE_INSTALL_DIR = $(PREFIX)\include\gail-$(GTK_API_VERSION).0 + +GDK_BASE_HEADERS = $(gdk_public_h_sources) + +GDK_CONFIG_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkconfig.h +GDK_ENUM_TYPES_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkenumtypes.h +GDK_VERSION_MACROS_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-$(GTK_API_VERSION)\gdk\gdkversionmacros.h +GDK_GENERATED_PUBLIC_H = $(GDK_CONFIG_H) $(GDK_ENUM_TYPES_H) $(GDK_VERSION_MACROS_H) + +GTK_TYPE_BULITINS_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-$(GTK_API_VERSION)\gtk\gtktypebuiltins.h +GTK_VERSION_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-$(GTK_API_VERSION)\gtk\gtkversion.h +GTK_GENERATED_PUBLIC_H = $(GTK_TYPE_BULITINS_H) $(GTK_VERSION_H) + +all: install-bin install-headers install-data + +# Copy the built files +install-bin: + @echo Copying built binaries and data files... + +# Copy the DLLs and programs and their .pdb's + @for %d in (bin lib) do @if not exist $(PREFIX)\%d\ mkdir $(PREFIX)\%d + @for %f in ($(GDK_BIN_ITEMS)) do @copy /b %f "$(PREFIX)\bin" + @for %f in ($(GTK_DLL_FILENAME) $(LIBGAIL_UTIL_DLL_FILENAME)) do @for %x in (dll pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\%f.%x "$(PREFIX)\bin" + @for %f in ($(GTK_PROGRAMS_NAMES)) do @for %x in (exe pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\gtk-%f.%x "$(PREFIX)\bin" + @for %f in ($(GTK3_PROGRAMS_NAMES)) do @for %x in (exe pdb) do @copy /b $(BASE_BUILT_BIN_DIR)\gtk3-%f.%x "$(PREFIX)\bin" + +# Copy the .lib's + @for %f in ($(GDK_LIB) $(GTK_LIB) $(LIBGAIL_UTIL_LIB)) do @copy /b %f "$(PREFIX)\lib" + @for %f in (gdk gtk gailutil) do @copy /b "$(PREFIX)\lib\%f-$(IMPLIB_SUFFIX)" "$(PREFIX)\lib\%f-$(GTK_API_VERSION).lib" + +# Generate the pkg-config files, if Python is callable and if it is not disabled + @if "$(NO_PKGCONFIG)" == "" if not exist $(PREFIX)\lib\pkgconfig\ mkdir $(PREFIX)\lib\pkgconfig + @-if "$(NO_PKGCONFIG)" == "" if exist $(PYTHON) $(PYTHON) gtkpc.py --prefix=$(PREFIX) --version=$(GTK_VERSION) --host=$(AT_PLAT)-pc-vs$(VSVER) $(GEN_PC_BROADWAY_FLAG) + @-if "$(NO_PKGCONFIG)" == "" if exist $(PYTHON).exe $(PYTHON) gtkpc.py --prefix=$(PREFIX) --version=$(GTK_VERSION) --host=$(AT_PLAT)-pc-vs$(VSVER) $(GEN_PC_BROADWAY_FLAG) + @for %f in (gdk gtk+) do @if exist %f-$(GTK_API_VERSION).0.pc copy "%f-$(GTK_API_VERSION).0.pc" "$(PREFIX)\lib\pkgconfig" + @for %f in (gail) do @if exist %f-$(GTK_API_VERSION).0.pc move %f-$(GTK_API_VERSION).0.pc $(PREFIX)\lib\pkgconfig + @for %f in (gdk gtk+) do @if exist %f-$(GTK_API_VERSION).0.pc move %f-$(GTK_API_VERSION).0.pc $(PREFIX)\lib\pkgconfig\%f-win32-$(GTK_API_VERSION).0.pc + +# Copy the introspection files, if built + @if exist $(GTK_TYPELIB_FILE) @for %d in (lib\girepository-1.0 share\gir-1.0) do @if not exist $(PREFIX)\%d\ mkdir $(PREFIX)\%d + @for %f in ($(GDK_GIR_FILE) $(GDKWIN32_GIR_FILE) $(GTK_GIR_FILE)) do @if exist %f copy /b %f "$(PREFIX)\share\gir-1.0" + @for %f in ($(GDK_TYPELIB_FILE) $(GDKWIN32_TYPELIB_FILE) $(GTK_TYPELIB_FILE)) do @if exist %f copy /b %f "$(PREFIX)\lib\girepository-1.0" + +# Copy the public headers +install-headers: + @echo Copying the headers... + +# Create the GDK header directories + @for %d in (gdk gdk\deprecated gdk\win32) do @if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\%d + @if not "$(BROADWAY)" == "" if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway + +# Create the GTK header directories + @for %d in (gtk gtk\a11y gtk\deprecated) do @if not exist $(GTK_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GTK_HEADERS_BASE_INSTALL_DIR)\%d + +# Create the libgail-util header directories + @for %d in (libgail-util) do @if not exist $(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\%d\ mkdir $(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\%d + +# Copy the GDK headers (with GdkWin32 and with Gdk-Broadway, if built) + @for %f in ($(GDK_GENERATED_PUBLIC_H)) do @copy %f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" + @for %f in ($(gdk_public_h_sources)) do @copy ..\gdk\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" + @for %f in ($(gdk_deprecated_h_sources:/=\)) do @copy ..\gdk\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\deprecated" + @for %f in ($(GDK_PUBLIC_H_SRCS_WIN32)) do @copy ..\gdk\win32\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" + @for %f in ($(libgdkwin32include_HEADERS)) do @copy ..\gdk\win32\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\win32" + @if not "$(BROADWAY)" == "" for %f in ($(GDK_PUBLIC_H_SRCS_BROADWAY)) do @copy ..\gdk\broadway\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk" + @if not "$(BROADWAY)" == "" for %f in ($(libgdkbroadwayinclude_HEADERS)) do @copy ..\gdk\broadway\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gdk\broadway" + +# Copy the GTK headers + @for %f in ($(GTK_GENERATED_PUBLIC_H)) do @copy %f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk" +# I hate the U1095 command line too long fatal error :|, work around it... + @for %f in ($(GTK_PUB_HDRS:.h=) $(gtk_semi_private_h_sources:.h=)) do @copy ..\gtk\%f.h "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk" + @for %f in ($(a11y_h_sources:a11y/=)) do @copy ..\gtk\a11y\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk\a11y" + @for %f in ($(gtk_deprecated_h_sources:deprecated/=)) do @copy ..\gtk\deprecated\%f "$(GTK_HEADERS_BASE_INSTALL_DIR)\gtk\deprecated" + +# Copy the libgail-util headers + @for %f in ($(util_public_h_sources)) do @copy ..\libgail-util\%f "$(GAILUTIL_HEADERS_BASE_INSTALL_DIR)\libgail-util" + +# install the data files +install-data: + @echo Copying the non-generated data files... +# GSettings schemas + @if not exist $(PREFIX)\share\glib-2.0\schemas\ mkdir $(PREFIX)\share\glib-2.0\schemas + @for %f in (..\gtk\org.gtk.Settings.*.gschema.xml ..\demos\gtk-demo\org.gtk.Demo.gschema.xml) do @copy %f "$(PREFIX)\share\glib-2.0\schemas" + @-$(GLIB_COMPILE_SCHEMAS) $(PREFIX)\share\glib-2.0\schemas +# Demo icons + @for %t in (16 22 24 32 48 256) do @for %d in ($(PREFIX)\share\icons\hicolor\%tx%t\apps) do @((if not exist %d\ mkdir %d) & copy /b ..\demos\gtk-demo\data\%tx%t\gtk3-demo.png "%d") + @-$(BASE_BUILT_BIN_DIR)\gtk-update-icon-cache.exe --ignore-theme-index --force "$(PREFIX)\share\icons\hicolor" From 455686a57fea60301d7341d9686bd3a10515d5bf Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 17:45:52 +0800 Subject: [PATCH 09/21] Visual Studio Projects: Use NMake Makefile to copy build results ... and so stop using gtk3-install.[vsprops|props], and remove that property sheet from the dist and dist the NMake Makefile for the purpose. Also remove win32/vs10/gtk3-install.vcxproj.filters as well, as it is no longer needed. We will remove the gtk3-install.[vsprops|[props][.in] in a subsequent commit. --- win32/Makefile.am | 1 + win32/vs10/Makefile.am | 3 - win32/vs10/gtk3-build-defines.props | 6 ++ win32/vs10/gtk3-install.vcxproj | 130 ++++-------------------- win32/vs10/gtk3-install.vcxproj.filters | 13 --- win32/vs11/Makefile.am | 2 - win32/vs12/Makefile.am | 2 - win32/vs14/Makefile.am | 2 - win32/vs15/Makefile.am | 2 - win32/vs16/Makefile.am | 2 - win32/vs17/Makefile.am | 2 - win32/vs9/Makefile.am | 2 - win32/vs9/gtk3-build-defines.vsprops | 4 + win32/vs9/gtk3-install.vcproj | 79 ++++++-------- 14 files changed, 63 insertions(+), 187 deletions(-) delete mode 100644 win32/vs10/gtk3-install.vcxproj.filters diff --git a/win32/Makefile.am b/win32/Makefile.am index 0e70d0d665..4e30405243 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -46,6 +46,7 @@ EXTRA_DIST += \ generate-msvc.mak \ gtk-introspection-msvc.mak \ introspection-msvc.mak \ + install-msvc.mak \ replace.py \ pc_base.py \ gtkpc.py \ diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index ef627102d4..30df5f1d74 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -19,7 +19,6 @@ GENERATED_ITEMS = \ gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ - gtk3-install.props \ gtk3-version-paths.props MSVC10_HEADERS_LISTS = \ @@ -60,12 +59,10 @@ EXTRA_DIST += \ gailutil-3.vcxprojin \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.propsin \ gtk3-version-paths.props.in \ $(GENERATED_ITEMS) diff --git a/win32/vs10/gtk3-build-defines.props b/win32/vs10/gtk3-build-defines.props index c8c511b9bd..0198734e79 100644 --- a/win32/vs10/gtk3-build-defines.props +++ b/win32/vs10/gtk3-build-defines.props @@ -32,6 +32,9 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall cd .. set VCInstallDir=$(VCInstallDir) nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) + cd .. +set VCInstallDir=$(VCInstallDir) +nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot) <_PropertySheetDisplayName>gtk3builddefinesprops @@ -117,5 +120,8 @@ nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) $(GenerateRequiredSourcesBase) + + $(InstallBuildsBase) + diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj index 290efb11a7..f2a6dcb6ab 100644 --- a/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -41,46 +41,46 @@ - Utility + Makefile MultiByte true v100 - Utility + Makefile MultiByte v100 - Utility + Makefile MultiByte true v100 - Utility + Makefile MultiByte v100 - Utility + Makefile MultiByte true v100 - Utility + Makefile MultiByte v100 - Utility + Makefile MultiByte true v100 - Utility + Makefile MultiByte v100 @@ -89,133 +89,43 @@ - + - + - + - + - + - + - + - + - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - + $(InstallBuildsBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) + $(InstallBuildsBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) + $(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) + $(InstallBuildsBase) CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion) - - - - - - - - - - - - - - - - - - - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) - blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) - - - Generating .pc files... - $(GenerateGtkPC) - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPC) --broadway - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) --broadway - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPC) - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPC) --broadway - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) - $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) --broadway - $(GtkPCFiles);%(Outputs) - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} diff --git a/win32/vs10/gtk3-install.vcxproj.filters b/win32/vs10/gtk3-install.vcxproj.filters deleted file mode 100644 index 6be701aa89..0000000000 --- a/win32/vs10/gtk3-install.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Resource Files - Resource Files - - diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index becafd26c1..813badfbb2 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST += \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index 1dd4ba7674..f9c7f5d814 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST += \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 318c87b7a9..458684cb8e 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST += \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index 619128e42c..88cdad3e28 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST_COPIED = \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST_COPIED = \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST_COPIED) diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index 64ca7a6c8c..0445eda9ec 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST += \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index 35d581e313..b2cb3a12e5 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ - gtk3-install.vcxproj.filters \ gtk3-introspect.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ @@ -36,7 +35,6 @@ EXTRA_DIST += \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-ignore-broadway.props \ - gtk3-install.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index eded327a89..4b6120ae37 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -17,7 +17,6 @@ GENERATED_ITEMS = \ gtk3-demo-application.vcproj \ gtk3-icon-browser.vcproj \ gailutil-3.vcproj \ - gtk3-install.vsprops \ gtk3-version-paths.vsprops EXTRA_DIST += \ @@ -42,7 +41,6 @@ EXTRA_DIST += \ gtk3-build-defines.vsprops \ gtk3-copy-gdk-broadway.vsprops \ gtk3-ignore-broadway.vsprops \ - gtk3-install.vspropsin \ gtk3-version-paths.vsprops.in \ $(GENERATED_ITEMS) diff --git a/win32/vs9/gtk3-build-defines.vsprops b/win32/vs9/gtk3-build-defines.vsprops index 449a3cba1f..561a5952b1 100644 --- a/win32/vs9/gtk3-build-defines.vsprops +++ b/win32/vs9/gtk3-build-defines.vsprops @@ -99,4 +99,8 @@ Name="GenerateRequiredSourcesBase" Value="cd .. set VCInstallDir=$(VCInstallDir) nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)" /> + diff --git a/win32/vs9/gtk3-install.vcproj b/win32/vs9/gtk3-install.vcproj index 01f7bbc83d..764397e502 100644 --- a/win32/vs9/gtk3-install.vcproj +++ b/win32/vs9/gtk3-install.vcproj @@ -21,113 +21,98 @@ From f4811ea1f1106b34b9980c2566ccd10374dea798 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 16 May 2022 17:59:02 +0800 Subject: [PATCH 10/21] build: Drop gtk3-install.[vsprops|props] They are not used anymore, and are removed at this point. --- gdk/Makefile.am | 8 -- gdk/broadway/Makefile.am | 8 +- gdk/win32/Makefile.am | 8 +- gtk/Makefile.am | 9 -- libgail-util/Makefile.am | 8 +- win32/Makefile.msvcproj | 30 +---- win32/vs10/Makefile.am | 16 --- win32/vs10/gtk3-install.propsin | 222 ------------------------------- win32/vs9/Makefile.am | 11 -- win32/vs9/gtk3-install.vspropsin | 208 ----------------------------- 10 files changed, 4 insertions(+), 524 deletions(-) delete mode 100644 win32/vs10/gtk3-install.propsin delete mode 100644 win32/vs9/gtk3-install.vspropsin diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 860973b73e..c9a731b693 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -459,13 +459,6 @@ MSVCPROJS = gdk-3 gdk_3_FILES = $(gdk_c_sources) gdk_3_EXCLUDES = dummy -gdk_3_HEADERS_DIR = $(gdkincludedir) - -gdk_3_HEADERS_INST = \ - $(gdkinclude_HEADERS) \ - $(deprecatedinclude_HEADERS) - -gdk_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj @@ -510,7 +503,6 @@ endif dist-hook: \ $(top_builddir)/win32/vs9/gdk-3.vcproj \ - $(top_builddir)/win32/vs9/gdk-3.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am index 81725deabb..3b518700dc 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -72,11 +72,6 @@ MSVCPROJS = gdk3-broadway broadwayd gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES) gdk3_broadway_EXCLUDES = dummy -gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir) - -gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS) - -gdk3_broadway_HEADERS_EXCLUDES = dummy broadwayd_FILES = $(broadwayd_SOURCES) broadwayd_EXCLUDES = dummy @@ -85,7 +80,6 @@ include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ $(top_builddir)/win32/vs9/gdk3-broadway.vcproj \ - $(top_builddir)/win32/vs9/broadwayd.vcproj \ - $(top_builddir)/win32/vs9/gdk3-broadway.headers + $(top_builddir)/win32/vs9/broadwayd.vcproj -include $(top_srcdir)/git.mk diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index a665a9cc02..586e8fddc0 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -47,16 +47,10 @@ MSVCPROJS = gdk3-win32 gdk3_win32_FILES = $(libgdk_win32_la_SOURCES) gdk3_win32_EXCLUDES = dummy -gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir) - -gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) - -gdk3_win32_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/win32/vs9/gdk3-win32.vcproj \ - $(top_builddir)/win32/vs9/gdk3-win32.headers + $(top_builddir)/win32/vs9/gdk3-win32.vcproj -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index c7c7caabd2..81d6ed2736 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -526,14 +526,6 @@ gtk_3_FILES = \ $(gtk_use_win32_c_sources) gtk_3_EXCLUDES = dummy -gtk_3_HEADERS_DIR = $(gtkincludedir) - -gtk_3_HEADERS_INST = \ - $(filter-out gtkversion.h, $(gtkinclude_HEADERS)) \ - $(a11y_h_sources) \ - $(gtk_deprecated_h_sources) - -gtk_3_HEADERS_EXCLUDES = gtktypebuiltins.h include $(top_srcdir)/win32/Makefile.msvcproj @@ -590,7 +582,6 @@ endif dist-hook: \ $(top_builddir)/win32/vs9/gtk-3.vcproj \ - $(top_builddir)/win32/vs9/gtk-3.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) # Install a RC file for the default GTK+ theme, and key themes diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am index aa2f93adcb..0b389ad8b8 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -82,16 +82,10 @@ MSVCPROJS = gailutil-3 gailutil_3_FILES = $(libgailutil_3_la_SOURCES) gailutil_3_EXCLUDES = dummy -gailutil_3_HEADERS_DIR = $(libgailutilincludedir) - -gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS) - -gailutil_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/win32/vs9/gailutil-3.vcproj \ - $(top_builddir)/win32/vs9/gailutil-3.headers + $(top_builddir)/win32/vs9/gailutil-3.vcproj -include $(top_srcdir)/git.mk diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj index cd7e469fb1..c341313aee 100644 --- a/win32/Makefile.msvcproj +++ b/win32/Makefile.msvcproj @@ -17,13 +17,9 @@ # MSVCPROJS = YourProject (can be multiple projects in a single srcdir) # YourProject_FILES = $(libyourlib_1_0_SOURCES) # YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# YourProject_HEADERS_DIR = $(libyourlibincludedir) -# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) -# YourProject_HEADERS_EXCLUDES = ... # # # dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/win32/vs9/YourProject.headers +# $(top_builddir)/win32/vs9/YourProject.vcproj # Private functions @@ -40,13 +36,6 @@ _proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) _proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) _proj_filters=$($(_proj_name)_EXCLUDES) -_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) -_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) -_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) - -_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) -_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) - # # Creates Visual Studio 2008/2010 projects from items passed in from autotools files # $(1) - Base Name of the MSVC project files (outputs) @@ -95,23 +84,6 @@ $(top_builddir)/win32/vs9/$(1).vcproj: Makefile $(RM) $(1).vs10.sourcefiles $(RM) $(1).vs10.sourcefiles.filters -$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers - -$(top_builddir)/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/win32/vs9/$(1).headers && \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - endef $(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 30df5f1d74..f12a18434f 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -21,13 +21,6 @@ GENERATED_ITEMS = \ gailutil-3.vcxproj.filters \ gtk3-version-paths.props -MSVC10_HEADERS_LISTS = \ - gdk3-win32.vs10.headers \ - gdk3-broadway.vs10.headers \ - gdk-3.vs10.headers \ - gtk-3.vs10.headers \ - gailutil-3.vs10.headers - EXTRA_DIST += \ README.txt \ gtk+.sln \ @@ -69,13 +62,4 @@ EXTRA_DIST += \ DISTCLEANFILES = \ $(GENERATED_ITEMS) -gtk3-install.props: $(top_srcdir)/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS) - -$(RM) $(top_builddir)/win32/vs11/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs12/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs14/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs15/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs16/gtk3-install.props - $(CPP) -P - <$(top_srcdir)/win32/vs10/gtk3-install.propsin >$@ - rm $(MSVC10_HEADERS_LISTS) - -include $(top_srcdir)/git.mk diff --git a/win32/vs10/gtk3-install.propsin b/win32/vs10/gtk3-install.propsin deleted file mode 100644 index 7e6cc466d3..0000000000 --- a/win32/vs10/gtk3-install.propsin +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - $(SolutionDir)$(Configuration)\$(Platform)\bin - -mkdir $(CopyDir)\bin -mkdir $(CopyDir)\share\gir-1.0 -mkdir $(CopyDir)\lib\pkgconfig -mkdir $(CopyDir)\lib\girepository-1.0 - -copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib - -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN -copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib -copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib -copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin -if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -goto DONE_BIN - -:DO_BROADWAY_BIN -copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin -copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin - -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG -:DO_BROADWAY_RELEASE -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib -copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib -copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin -if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0 - -goto DONE_BIN - -:DO_BROADWAY_DEBUG -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib -copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib -copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin -if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0 - -:DONE_BIN - -copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc -copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig -copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc" -copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig - - -echo off -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32 -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated -copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk - -if "$(Configuration)" == "Release" goto COPY_RELEASE_BUILT_HEADERS -if "$(Configuration)" == "Release_Broadway" goto COPY_RELEASE_BUILT_HEADERS -if "$(Configuration)" == "Debug" goto COPY_DEBUG_BUILT_HEADERS -if "$(Configuration)" == "Debug_Broadway" goto COPY_DEBUG_BUILT_HEADERS - -:COPY_DEBUG_BUILT_HEADERS -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -goto CONTINUE_HEADERS - -:COPY_RELEASE_BUILT_HEADERS -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -copy .\Release\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -goto CONTINUE_HEADERS - -:CONTINUE_HEADERS -#include "gdk-3.vs10.headers" -#include "gdk3-win32.vs10.headers" - -#include "gtk-3.vs10.headers" - -mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util -#include "gailutil-3.vs10.headers" - - -for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps)) - -mkdir $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas - - -copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway -#include "gdk3-broadway.vs10.headers" - - -echo "Compiling gsettings XML Files..." -$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas - -echo "Generating icon cache......" -$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" - - $(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) - $(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) - ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc - - - <_PropertySheetDisplayName>gtk3installsprops - - - - $(BinDir) - - - $(InstalledDlls) - - - $(InstalledBins) - - - $(InstalledBroadwayBins) - - - $(GtkDoInstallBin) - - - $(GtkDoInstall) - - - $(GtkDoInstallBroadwayHeaders) - - - $(GtkPostInstall) - - - $(GenerateGtkPC) - - - $(GenerateGtkPCX64) - - - $(GtkPCFiles) - - - diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index 4b6120ae37..f19e52c9f2 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -1,12 +1,5 @@ include $(top_srcdir)/Makefile.decl -MSVC_HEADERS_LISTS = \ - gdk3-win32.headers \ - gdk3-broadway.headers \ - gdk-3.headers \ - gtk-3.headers \ - gailutil-3.headers - GENERATED_ITEMS = \ gdk3-win32.vcproj \ gdk3-broadway.vcproj \ @@ -44,10 +37,6 @@ EXTRA_DIST += \ gtk3-version-paths.vsprops.in \ $(GENERATED_ITEMS) -gtk3-install.vsprops: $(top_srcdir)/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS) - $(CPP) -P - <$(top_srcdir)/win32/vs9/gtk3-install.vspropsin >$@ - rm $(MSVC_HEADERS_LISTS) - DISTCLEANFILES = $(GENERATED_ITEMS) -include $(top_srcdir)/git.mk diff --git a/win32/vs9/gtk3-install.vspropsin b/win32/vs9/gtk3-install.vspropsin deleted file mode 100644 index 4fb97df337..0000000000 --- a/win32/vs9/gtk3-install.vspropsin +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - From c50cd6f95ca4037c67f4b7469ea323894093b76a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 17 May 2022 11:27:57 +0800 Subject: [PATCH 11/21] Visual Studio projects: Drop unneeded property sheet We can use MSBuild trickery to do what the property sheet intends to cover --- win32/vs10/Makefile.am | 1 - win32/vs10/gdk-3.vcxprojin | 14 ++++++++++---- win32/vs10/gtk3-ignore-broadway.props | 18 ------------------ win32/vs11/Makefile.am | 1 - win32/vs12/Makefile.am | 1 - win32/vs14/Makefile.am | 1 - win32/vs15/Makefile.am | 1 - win32/vs16/Makefile.am | 1 - win32/vs17/Makefile.am | 1 - 9 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 win32/vs10/gtk3-ignore-broadway.props diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index f12a18434f..06e78a8819 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -55,7 +55,6 @@ EXTRA_DIST += \ gtk3-introspect.vcxproj \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props.in \ $(GENERATED_ITEMS) diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index fd5e79eb17..92451400c2 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -89,19 +89,19 @@ - + - + - + - + @@ -154,6 +154,7 @@ Windows $(TargetDir)$(ProjectName).0.lib MachineX86 + /EXPORT:gdk_win32_display_manager_get_type @@ -205,6 +206,7 @@ true true MachineX86 + /EXPORT:gdk_win32_display_manager_get_type @@ -256,6 +258,7 @@ $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows MachineX64 + /EXPORT:gdk_win32_display_manager_get_type @@ -307,6 +310,7 @@ true true MachineX64 + /EXPORT:gdk_win32_display_manager_get_type @@ -348,6 +352,8 @@ {1df4c475-4472-4ee4-ac2b-3ab5a4c1a453} false + false + false {aba7685a-7cbb-4626-b5e5-6eeea5b489ef} diff --git a/win32/vs10/gtk3-ignore-broadway.props b/win32/vs10/gtk3-ignore-broadway.props deleted file mode 100644 index 0c97cf0de9..0000000000 --- a/win32/vs10/gtk3-ignore-broadway.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - <_PropertySheetDisplayName>gtk3ignorebroadwayprops - - - - false - - - $(OutDir)\gdk3-win32.lib;%(AdditionalDependencies) - /EXPORT:gdk_win32_display_manager_get_type - - - diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index 813badfbb2..94792f4898 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index f9c7f5d814..a6a63ded35 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 458684cb8e..6ed9e9a257 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index 88cdad3e28..ae66589a6a 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST_COPIED = \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST_COPIED) diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index 0445eda9ec..54b4b6812b 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index b2cb3a12e5..8a324560db 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -34,7 +34,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-ignore-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) From ac25eeb34af34b0fb619da6b3e22f0d0fd4dcaac Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 17 May 2022 11:59:31 +0800 Subject: [PATCH 12/21] Visual Studio projects: Drop another property sheet We can again use MSBuild trickery to do what was done in the dropped property sheet. Unfortunately, like the last commit, I couldn't figure out a way do to something similar in the VS2008 project files... :| --- win32/vs10/Makefile.am | 1 - win32/vs10/gdk-3.vcxprojin | 24 ++++++++++-- win32/vs10/gtk3-copy-gdk-broadway.props | 50 ------------------------- win32/vs11/Makefile.am | 1 - win32/vs12/Makefile.am | 1 - win32/vs14/Makefile.am | 1 - win32/vs15/Makefile.am | 1 - win32/vs16/Makefile.am | 1 - win32/vs17/Makefile.am | 1 - 9 files changed, 20 insertions(+), 61 deletions(-) delete mode 100644 win32/vs10/gtk3-copy-gdk-broadway.props diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 06e78a8819..1ed6395d81 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -54,7 +54,6 @@ EXTRA_DIST += \ gtk3-install.vcxproj \ gtk3-introspect.vcxproj \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props.in \ $(GENERATED_ITEMS) diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index 92451400c2..19416703a4 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -105,19 +105,19 @@ - + - + - + - + @@ -181,6 +181,7 @@ $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows MachineX86 + /EXPORT:gdk_win32_display_manager_get_type @@ -232,6 +233,7 @@ true true MachineX86 + /EXPORT:gdk_win32_display_manager_get_type @@ -285,6 +287,7 @@ $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows MachineX64 + /EXPORT:gdk_win32_display_manager_get_type @@ -336,8 +339,21 @@ true true MachineX64 + /EXPORT:gdk_win32_display_manager_get_type + + + +if not exist $(OutDir)\..\..\..\Debug\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Debug\$(Platform)\bin +copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" "$(OutDir)\..\..\..\Debug\$(Platform)\bin" +copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Debug\$(Platform)\bin" + +if not exist $(OutDir)\..\..\..\Release\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Release\$(Platform)\bin +copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" "$(OutDir)\..\..\..\Release\$(Platform)\bin" +copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Release\$(Platform)\bin" + + diff --git a/win32/vs10/gtk3-copy-gdk-broadway.props b/win32/vs10/gtk3-copy-gdk-broadway.props deleted file mode 100644 index c2e6829250..0000000000 --- a/win32/vs10/gtk3-copy-gdk-broadway.props +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - <_PropertySheetDisplayName>gtk3copygdkbroadwayprops - - - - /EXPORT:gdk_win32_display_manager_get_type - - - -if "$(Configuration)" == "Release" goto END - -if "$(Configuration)" == "Debug" goto END - -if "$(Configuration)" == "Release_Broadway" goto DoRelease - -if "$(Configuration)" == "Debug_Broadway" goto DoDebug - - -:DoRelease - -mkdir .\Release\$(Platform)\bin - -copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll .\Release\$(Platform)\bin\ - -copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\ - -goto END - - -:DoDebug - -mkdir .\Debug\$(Platform)\bin - -copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\ - -copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\ - -goto END - - -:END - - - - diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index 94792f4898..4a083d03cd 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index a6a63ded35..7b37d57ae9 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 6ed9e9a257..72f88d160c 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index ae66589a6a..a1ab89dec3 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST_COPIED = \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST_COPIED) diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index 54b4b6812b..eb567707ec 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index 8a324560db..b1ee919f95 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ - gtk3-copy-gdk-broadway.props \ gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) From 4c2cd5910f276a048b940efb1421090a3312399a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 17 May 2022 12:33:22 +0800 Subject: [PATCH 13/21] Visual Studio projects: Make property sheets shared ...for Visual Studio 2010 and later, since we used to copy them and merely update the value of $(VSVer) during 'make dist' as needed. Instead of doing that, move the property sheets for Visual Studio 2010, which is the base version that we use, into a directory of its own, and make the Visual Studio 2010~2022 projects look for them in that directory, and set VSVer according to the toolset version identified by each of the project files. The ARM64-specific property sheet needed for VS2017 and the VS2008 property sheets will remain as they are. --- configure.ac | 3 ++- win32/Makefile-newvs.am | 7 ------- win32/Makefile.am | 3 ++- win32/vs10/Makefile.am | 5 +---- win32/vs10/broadwayd.vcxprojin | 8 ++++---- win32/vs10/gailutil-3.vcxprojin | 8 ++++---- win32/vs10/gdk-3.vcxprojin | 16 ++++++++-------- win32/vs10/gdk3-broadway.vcxprojin | 8 ++++---- win32/vs10/gdk3-win32.vcxprojin | 8 ++++---- win32/vs10/gtk-3.vcxprojin | 8 ++++---- win32/vs10/gtk-builder-tool.vcxproj | 8 ++++---- win32/vs10/gtk-encode-symbolic-svg.vcxproj | 8 ++++---- win32/vs10/gtk-query-settings.vcxproj | 8 ++++---- win32/vs10/gtk-update-icon-cache.vcxproj | 8 ++++---- win32/vs10/gtk3-demo-application.vcxprojin | 8 ++++---- win32/vs10/gtk3-demo.vcxprojin | 8 ++++---- win32/vs10/gtk3-icon-browser.vcxprojin | 8 ++++---- win32/vs10/gtk3-install.vcxproj | 16 ++++++++-------- win32/vs10/gtk3-introspect.vcxproj | 8 ++++---- win32/vs10/gtk3-prebuild.vcxproj | 16 ++++++++-------- win32/vs11/Makefile.am | 4 +--- win32/vs12/Makefile.am | 4 +--- win32/vs14/Makefile.am | 4 +--- win32/vs15/Makefile.am | 4 +--- win32/vs16/Makefile.am | 4 +--- win32/vs17/Makefile.am | 4 +--- win32/vs1x-props/Makefile.am | 13 +++++++++++++ .../gtk3-build-defines.props | 0 .../gtk3-version-paths.props.in | 9 ++++++++- 29 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 win32/vs1x-props/Makefile.am rename win32/{vs10 => vs1x-props}/gtk3-build-defines.props (100%) rename win32/{vs10 => vs1x-props}/gtk3-version-paths.props.in (87%) diff --git a/configure.ac b/configure.ac index e9ded998fc..a665921783 100644 --- a/configure.ac +++ b/configure.ac @@ -1963,13 +1963,14 @@ win32/config-msvc.mak win32/vs9/Makefile win32/vs9/gtk3-version-paths.vsprops win32/vs10/Makefile -win32/vs10/gtk3-version-paths.props win32/vs11/Makefile win32/vs12/Makefile win32/vs14/Makefile win32/vs15/Makefile win32/vs16/Makefile win32/vs17/Makefile +win32/vs1x-props/Makefile +win32/vs1x-props/gtk3-version-paths.props gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am index a68e2f99ca..44c927a867 100644 --- a/win32/Makefile-newvs.am +++ b/win32/Makefile-newvs.am @@ -38,13 +38,6 @@ endif sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ fi -%.props: $(top_builddir)/win32/vs10/Makefile - if test -e $(top_srcdir)/win32/vs10/$@; then \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - elif test -e $(top_builddir)/win32/vs10/$@; then \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - %.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile if test -e $(top_srcdir)/win32/vs10/$@; then \ cp $(top_srcdir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ diff --git a/win32/Makefile.am b/win32/Makefile.am index 4e30405243..98424c3771 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -34,7 +34,8 @@ SUBDIRS = \ vs14 \ vs15 \ vs16 \ - vs17 + vs17 \ + vs1x-props EXTRA_DIST += \ config-msvc.mak \ diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 1ed6395d81..b49bb752fe 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -18,8 +18,7 @@ GENERATED_ITEMS = \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-version-paths.props + gailutil-3.vcxproj.filters EXTRA_DIST += \ README.txt \ @@ -53,8 +52,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ gtk3-introspect.vcxproj \ - gtk3-build-defines.props \ - gtk3-version-paths.props.in \ $(GENERATED_ITEMS) DISTCLEANFILES = \ diff --git a/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin index 5e4f3e5415..df35a803fa 100644 --- a/win32/vs10/broadwayd.vcxprojin +++ b/win32/vs10/broadwayd.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin index b28b1df7e8..d469f32c02 100644 --- a/win32/vs10/gailutil-3.vcxprojin +++ b/win32/vs10/gailutil-3.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index 19416703a4..8e469683e5 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin index 9827954fac..26a531fc64 100644 --- a/win32/vs10/gdk3-broadway.vcxprojin +++ b/win32/vs10/gdk3-broadway.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin index 37e5586c01..913818e171 100644 --- a/win32/vs10/gdk3-win32.vcxprojin +++ b/win32/vs10/gdk3-win32.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin index 188340308c..c010b3c26d 100644 --- a/win32/vs10/gtk-3.vcxprojin +++ b/win32/vs10/gtk-3.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj index d88a9e65d7..ee295b2912 100644 --- a/win32/vs10/gtk-builder-tool.vcxproj +++ b/win32/vs10/gtk-builder-tool.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj index da630f7f51..ca69b4e794 100644 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj index 24717aa73f..207b1ba13e 100644 --- a/win32/vs10/gtk-query-settings.vcxproj +++ b/win32/vs10/gtk-query-settings.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj index b94c809e0c..567971b9cf 100644 --- a/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/win32/vs10/gtk-update-icon-cache.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin index 9167c4c2c4..05c058557c 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin index 76f22e512a..fd4850ccf3 100644 --- a/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin index 70f76d8ccf..e5edefb15b 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj index f2a6dcb6ab..0409671572 100644 --- a/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj index cba81df3c2..7905684ed2 100644 --- a/win32/vs10/gtk3-introspect.vcxproj +++ b/win32/vs10/gtk3-introspect.vcxproj @@ -52,19 +52,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj index b73d9802cc..dc3136275f 100644 --- a/win32/vs10/gtk3-prebuild.vcxproj +++ b/win32/vs10/gtk3-prebuild.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index 4a083d03cd..c95331e099 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index 7b37d57ae9..4e669865be 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 72f88d160c..ac099944c3 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index a1ab89dec3..8a95e9eae9 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST_COPIED = \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST_COPIED) EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.Build.props diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index eb567707ec..6bdff1695a 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index b1ee919f95..0ddde0d50e 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs1x-props/Makefile.am b/win32/vs1x-props/Makefile.am new file mode 100644 index 0000000000..7f3bbf6c9e --- /dev/null +++ b/win32/vs1x-props/Makefile.am @@ -0,0 +1,13 @@ +include $(top_srcdir)/Makefile.decl + +GENERATED_ITEMS = gtk3-version-paths.props + +EXTRA_DIST += \ + gtk3-build-defines.props \ + gtk3-version-paths.props.in \ + $(GENERATED_ITEMS) + +DISTCLEANFILES = \ + $(GENERATED_ITEMS) + +-include $(top_srcdir)/git.mk diff --git a/win32/vs10/gtk3-build-defines.props b/win32/vs1x-props/gtk3-build-defines.props similarity index 100% rename from win32/vs10/gtk3-build-defines.props rename to win32/vs1x-props/gtk3-build-defines.props diff --git a/win32/vs10/gtk3-version-paths.props.in b/win32/vs1x-props/gtk3-version-paths.props.in similarity index 87% rename from win32/vs10/gtk3-version-paths.props.in rename to win32/vs1x-props/gtk3-version-paths.props.in index f8c0a16bba..5c34e804d5 100644 --- a/win32/vs10/gtk3-version-paths.props.in +++ b/win32/vs1x-props/gtk3-version-paths.props.in @@ -1,7 +1,14 @@  - 10 + 10 + 10 + 11 + 12 + 14 + 15 + 16 + 17 $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) ..\..\..\vs$(VSVer)\$(Platform) 3.0 From 3bd1ed8c313daac613241383b0871dd4e3a4f1c4 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 17 May 2022 17:30:10 +0800 Subject: [PATCH 14/21] win32/vs10/*.vcxprojin: Consolidate project configs We can use MSBuild "Condition" items to consolidate the configs, so that we can clean up the project files a bit. --- win32/vs10/broadwayd.vcxprojin | 144 ++------- win32/vs10/gailutil-3.vcxprojin | 149 ++------- win32/vs10/gdk-3.vcxprojin | 333 ++++----------------- win32/vs10/gdk3-broadway.vcxprojin | 95 ++---- win32/vs10/gdk3-win32.vcxprojin | 95 ++---- win32/vs10/gtk-3.vcxprojin | 139 ++------- win32/vs10/gtk3-demo-application.vcxprojin | 139 ++------- win32/vs10/gtk3-demo.vcxprojin | 146 ++------- win32/vs10/gtk3-icon-browser.vcxprojin | 142 ++------- 9 files changed, 278 insertions(+), 1104 deletions(-) diff --git a/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin index df35a803fa..9436f2e94e 100644 --- a/win32/vs10/broadwayd.vcxprojin +++ b/win32/vs10/broadwayd.vcxprojin @@ -24,142 +24,60 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - true - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + $(GdkDefines);%(PreprocessorDefinitions) + true + MultiThreadedDLL + ProgramDatabase ws2_32.lib;%(AdditionalDependencies) true Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - true - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin index d469f32c02..423b338b97 100644 --- a/win32/vs10/gailutil-3.vcxprojin +++ b/win32/vs10/gailutil-3.vcxprojin @@ -24,66 +24,46 @@ Win32Proj - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - + DynamicLibrary MultiByte + true v100 - - - - - - - - - - - - - + - true - true - false - false + true + false - + - Disabled $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - EditAndContinue + + + Disabled + _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + MultiThreadedDLL + true + ProgramDatabase atk-1.0.lib;%(AdditionalDependencies) @@ -93,80 +73,13 @@ true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows - MachineX86 - - - - - MaxSpeed - true - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - - - - - Disabled - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - - - - - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index 8e469683e5..96b8cd137b 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -40,306 +40,91 @@ Win32Proj - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - + DynamicLibrary MultiByte + true + true v100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - true - false - true - false - true - false - true - false + true + false + true + false - + - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - EditAndContinue + + + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) + + + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + + + Disabled + Disabled + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + true + EnableFastChecks + EnableFastChecks + MultiThreadedDebugDLL + MultiThreadedDebugDLL + EditAndContinue + EditAndContinue + ProgramDatabase + ProgramDatabase + + + $(GdkDefines);%(PreprocessorDefinitions) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + MultiThreadedDLL + ProgramDatabase + ProgramDatabase ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows $(TargetDir)$(ProjectName).0.lib - MachineX86 - /EXPORT:gdk_win32_display_manager_get_type - - - - - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX86 - /EXPORT:gdk_win32_display_manager_get_type - - - - - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - /EXPORT:gdk_win32_display_manager_get_type - - - - - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - /EXPORT:gdk_win32_display_manager_get_type - - - - - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - /EXPORT:gdk_win32_display_manager_get_type - - - - - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - /EXPORT:gdk_win32_display_manager_get_type - - - - - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 - /EXPORT:gdk_win32_display_manager_get_type - - - - - $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) - - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 /EXPORT:gdk_win32_display_manager_get_type + + + $(GdkAdditionalLibs);%(AdditionalDependencies) + $(GdkAdditionalLibs);%(AdditionalDependencies) + + + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) + + + true + true + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin index 26a531fc64..123d6d70e8 100644 --- a/win32/vs10/gdk3-broadway.vcxprojin +++ b/win32/vs10/gdk3-broadway.vcxprojin @@ -24,96 +24,39 @@ Win32Proj - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - true - v100 - - + StaticLibrary MultiByte + true v100 - - - - - - - - - - - - - + - - - Disabled - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - + Level3 - ProgramDatabase - - - - - Disabled - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - - - $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase + + + Disabled + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + ProgramDatabase diff --git a/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin index 913818e171..f49e8de447 100644 --- a/win32/vs10/gdk3-win32.vcxprojin +++ b/win32/vs10/gdk3-win32.vcxprojin @@ -24,96 +24,39 @@ Win32Proj - - StaticLibrary - MultiByte - true - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - true - v100 - - + StaticLibrary MultiByte + true v100 - - - - - - - - - - - - - + - - - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - - + Level3 - ProgramDatabase - - - - - Disabled - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - - - $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase + + + Disabled + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + ProgramDatabase diff --git a/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin index c010b3c26d..c9922105cb 100644 --- a/win32/vs10/gtk-3.vcxprojin +++ b/win32/vs10/gtk-3.vcxprojin @@ -26,22 +26,7 @@ Win32Proj - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - + DynamicLibrary MultiByte v100 @@ -49,41 +34,34 @@ - - - - - - - - - - - - - + - true - false - true - false + true + false - + + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) + + Level3 + + Disabled - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + ProgramDatabase $(GtkAdditionalLibs);%(AdditionalDependencies) @@ -92,74 +70,13 @@ true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb Windows - MachineX86 - - - - - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GtkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - $(GtkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - - - - - Disabled - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - $(GtkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - - - - - $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GtkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - $(GtkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin index 05c058557c..a0f78dc980 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxprojin @@ -24,138 +24,57 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - + - Disabled $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - - - Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + ProgramDatabase true Console + + true true - MachineX86 - - - - - X64 - - - Disabled - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX64 + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin index fd4850ccf3..0848a45bb4 100644 --- a/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -24,144 +24,58 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - true - false - false + true + false - + - Disabled $(GtkBaseIncludes);%(AdditionalIncludeDirectories) - _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - EditAndContinue CompileAsC + + + Disabled + _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + $(GtkPrefixDefine);%(PreprocessorDefinitions) + MultiThreadedDLL + ProgramDatabase %(AdditionalDependencies) true Console - - - MachineX86 - - - - - $(GtkBaseIncludes);%(AdditionalIncludeDirectories) - $(GtkPrefixDefine);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - true - true - - - MachineX86 - - - - - Disabled - $(GtkBaseIncludes);%(AdditionalIncludeDirectories) - _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - - - MachineX64 - - - - - $(GtkBaseIncludes);%(AdditionalIncludeDirectories) - $(GtkPrefixDefine);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - true - true - - - MachineX64 + + + + false + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin index e5edefb15b..0fc1738254 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -24,138 +24,60 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - MaxSpeed - ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + ProgramDatabase true Console - MachineX64 - - - - - X64 - - - MaxSpeed - ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - false - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 From 6e193eb14137a6c4ad701560ebbc6db6b2af99ef Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 18 May 2022 11:40:59 +0800 Subject: [PATCH 15/21] win32/vs10/*.vcxproj: Consolidate project configs Like what was done in the *.vcxprojin templates, consolidate project configs that are repetitive, and use the 'Condition=' directive to distinguish between configuration and/or target platform differences. --- win32/vs10/gtk-builder-tool.vcxproj | 145 +++++---------------- win32/vs10/gtk-encode-symbolic-svg.vcxproj | 145 +++++---------------- win32/vs10/gtk-query-settings.vcxproj | 145 +++++---------------- win32/vs10/gtk-update-icon-cache.vcxproj | 145 +++++---------------- win32/vs10/gtk3-install.vcxproj | 71 +--------- win32/vs10/gtk3-introspect.vcxproj | 57 +------- win32/vs10/gtk3-prebuild.vcxproj | 94 +++---------- 7 files changed, 151 insertions(+), 651 deletions(-) diff --git a/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj index ee295b2912..12420c3377 100644 --- a/win32/vs10/gtk-builder-tool.vcxproj +++ b/win32/vs10/gtk-builder-tool.vcxproj @@ -24,142 +24,61 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + ProgramDatabase %(AdditionalDependencies) true Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj index ca69b4e794..fcd0a6df75 100644 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -24,142 +24,61 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - $(GdkBaseIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - $(GdkBaseIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled $(GdkBaseIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + ProgramDatabase %(AdditionalDependencies) true Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(GdkBaseIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj index 207b1ba13e..610b04815f 100644 --- a/win32/vs10/gtk-query-settings.vcxproj +++ b/win32/vs10/gtk-query-settings.vcxproj @@ -24,142 +24,61 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + ProgramDatabase %(AdditionalDependencies) true Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj index 567971b9cf..f6ea9eb54f 100644 --- a/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/win32/vs10/gtk-update-icon-cache.vcxproj @@ -24,142 +24,61 @@ Win32Proj - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - + Application MultiByte + true v100 - - - - - - - - - - - - - + - true - false - true - false + true + false - - - Disabled - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - + - X64 + X64 - Disabled $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - + Level3 - ProgramDatabase + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + ProgramDatabase %(AdditionalDependencies) true Console - MachineX64 - - - - - X64 - - - MaxSpeed - $(BaseConfigIncludes);%(AdditionalIncludeDirectories) - true - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX64 + + + true + true + + MachineX86 + MachineX64 diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj index 0409671572..588515d8aa 100644 --- a/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -40,46 +40,7 @@ Win32Proj - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - + Makefile MultiByte v100 @@ -87,35 +48,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj index 7905684ed2..1a4409aa16 100644 --- a/win32/vs10/gtk3-introspect.vcxproj +++ b/win32/vs10/gtk3-introspect.vcxproj @@ -23,69 +23,20 @@ gtk3introspect - - Makefile - true - MultiByte - v100 - - - Makefile - false - true - MultiByte - v100 - - + Makefile MultiByte v100 - - Makefile - MultiByte - true - v100 - - - - - - - - - - - - - - + - - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean - $(GtkIntrospectBuiltFiles) - - - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean - $(GtkIntrospectBuiltFiles) - - - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean - $(GtkIntrospectBuiltFiles) - - + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean @@ -104,4 +55,4 @@ - \ No newline at end of file + diff --git a/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj index dc3136275f..a0b5829ae8 100644 --- a/win32/vs10/gtk3-prebuild.vcxproj +++ b/win32/vs10/gtk3-prebuild.vcxproj @@ -40,46 +40,7 @@ Win32Proj - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - + Makefile MultiByte v100 @@ -87,52 +48,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) generate-base-sources + $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean generate-base-sources - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean + + + $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) generate-base-sources + $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean generate-base-sources $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean + + + $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) generate-base-sources + $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources + $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean + + + $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) generate-base-sources + $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean generate-base-sources + $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean From f324c650a717d2d0a12faafa7a8c2f2888ace72e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 18 May 2022 15:49:05 +0800 Subject: [PATCH 16/21] gdk/: Rename gdk-pub-headers.h to gdk-sources.inc We want to make the sources listings for libgdk shared as well. --- gdk/Makefile.am | 2 +- gdk/{gdk-pub-headers.mak => gdk-sources.inc} | 0 win32/create-lists-msvc.mak | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename gdk/{gdk-pub-headers.mak => gdk-sources.inc} (100%) diff --git a/gdk/Makefile.am b/gdk/Makefile.am index c9a731b693..451beac7eb 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for gtk+/gdk include $(top_srcdir)/Makefile.decl -include gdk-pub-headers.mak +include gdk-sources.inc -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = diff --git a/gdk/gdk-pub-headers.mak b/gdk/gdk-sources.inc similarity index 100% rename from gdk/gdk-pub-headers.mak rename to gdk/gdk-sources.inc diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index 3763342b76..3fce81333a 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -34,7 +34,7 @@ NULL= # For GDK enumeration sources -!include ..\gdk\gdk-pub-headers.mak +!include ..\gdk\gdk-sources.inc !if [call create-lists.bat header gdk_headers.mak GDK_PUBLIC_HEADERS] !endif From 7c2e4fa3b250551b67e423898fe9d5f71ae6bcf1 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 18 May 2022 15:59:35 +0800 Subject: [PATCH 17/21] gdk: Move source listings to gdk-sources.inc We want to share those listings with other non-autools build systems. --- gdk/Makefile.am | 169 -------------------------------------------- gdk/gdk-sources.inc | 169 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 169 deletions(-) diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 451beac7eb..3e9f90a280 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -62,94 +62,6 @@ LDADD = \ -rpath $(libdir) \ $(no_undefined) -# -# setup source file variables -# - -gdk_h_sources = \ - $(gdk_public_h_sources) \ - $(gdk_deprecated_h_sources) - -gdk_private_headers = \ - gdk-private.h \ - gdkapplaunchcontextprivate.h \ - gdkconstructor.h \ - gdkcursorprivate.h \ - gdkdevicemanagerprivate.h \ - gdkdeviceprivate.h \ - gdkdevicepadprivate.h \ - gdkdevicetoolprivate.h \ - gdkdisplaymanagerprivate.h \ - gdkdisplayprivate.h \ - gdkdndprivate.h \ - gdkdrawingcontextprivate.h \ - gdkframeclockidle.h \ - gdkframeclockprivate.h \ - gdkglcontextprivate.h \ - gdkmonitorprivate.h \ - gdkprofilerprivate.h \ - gdkscreenprivate.h \ - gdkseatprivate.h \ - gdkseatdefaultprivate.h \ - gdkinternals.h \ - gdkintl.h \ - gdkkeysprivate.h \ - gdkvisualprivate.h \ - gdkx.h - -deprecated_c_sources = \ - deprecated/gdkcolor.c - -gdk_c_sources = \ - $(deprecated_c_sources) \ - gdk-private.c \ - gdk.c \ - gdkapplaunchcontext.c \ - gdkcairo.c \ - gdkcursor.c \ - gdkdeprecated.c \ - gdkdevice.c \ - gdkdevicepad.c \ - gdkdevicetool.c \ - gdkdevicemanager.c \ - gdkdisplay.c \ - gdkdisplaymanager.c \ - gdkdnd.c \ - gdkdrawingcontext.c \ - gdkevents.c \ - gdkframetimings.c \ - gdkgl.c \ - gdkglcontext.c \ - gdkglobals.c \ - gdkkeys.c \ - gdkkeyuni.c \ - gdkmonitor.c \ - gdkoffscreenwindow.c \ - gdkframeclock.c \ - gdkframeclockidle.c \ - gdkpango.c \ - gdkpixbuf-drawable.c \ - gdkprofiler.c \ - gdkproperty.c \ - gdkrectangle.c \ - gdkrgba.c \ - gdkscreen.c \ - gdkseat.c \ - gdkseatdefault.c \ - gdkselection.c \ - gdkvisual.c \ - gdkwindow.c \ - gdkwindowimpl.c - -gdk_built_sources = \ - gdkenumtypes.h \ - gdkenumtypes.c \ - gdkmarshalers.h \ - gdkmarshalers.c \ - gdkresources.h \ - gdkresources.c \ - gdkversionmacros.h - # # setup GDK sources and their dependencies # @@ -217,57 +129,6 @@ if OS_WIN32 Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir) endif if USE_X11 -x11_introspection_files = \ - x11/gdkapplaunchcontext-x11.c \ - x11/gdkasync.c \ - x11/gdkcursor-x11.c \ - x11/gdkdevice-core-x11.c \ - x11/gdkdevicemanager-core-x11.c \ - x11/gdkdevicemanager-x11.c \ - x11/gdkdevicemanager-xi2.c \ - x11/gdkdevice-xi2.c \ - x11/gdkdisplay-x11.c \ - x11/gdkdisplaymanager-x11.c \ - x11/gdkdnd-x11.c \ - x11/gdkeventsource.c \ - x11/gdkeventtranslator.c \ - x11/gdkgeometry-x11.c \ - x11/gdkglcontext-x11.c \ - x11/gdkkeys-x11.c \ - x11/gdkmain-x11.c \ - x11/gdkmonitor-x11.c \ - x11/gdkproperty-x11.c \ - x11/gdkscreen-x11.c \ - x11/gdkselection-x11.c \ - x11/gdksettings.c \ - x11/gdktestutils-x11.c \ - x11/gdkvisual-x11.c \ - x11/gdkwindow-x11.c \ - x11/gdkxftdefaults.c \ - x11/gdkxid.c \ - x11/xsettings-client.c \ - x11/gdkx.h \ - x11/gdkx11applaunchcontext.h \ - x11/gdkx11cursor.h \ - x11/gdkx11device.h \ - x11/gdkx11device-core.h \ - x11/gdkx11device-xi2.h \ - x11/gdkx11devicemanager.h \ - x11/gdkx11devicemanager-core.h \ - x11/gdkx11devicemanager-xi2.h \ - x11/gdkx11display.h \ - x11/gdkx11displaymanager.h \ - x11/gdkx11dnd.h \ - x11/gdkx11glcontext.h \ - x11/gdkx11keys.h \ - x11/gdkx11monitor.h \ - x11/gdkx11property.h \ - x11/gdkx11screen.h \ - x11/gdkx11selection.h \ - x11/gdkx11utils.h \ - x11/gdkx11visual.h \ - x11/gdkx11window.h - GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile GdkX11_3_0_gir_SCANNERFLAGS = \ --identifier-prefix=Gdk \ @@ -282,36 +143,6 @@ INTROSPECTION_GIRS += GdkX11-3.0.gir endif # USE_X11 -w32_introspection_files = \ - win32/gdkcursor-win32.c \ - win32/gdkdevicemanager-win32.c \ - win32/gdkdevice-virtual.c \ - win32/gdkdevice-win32.c \ - win32/gdkdevice-wintab.c \ - win32/gdkdisplaymanager-win32.c \ - win32/gdkdisplay-win32.c \ - win32/gdkdnd-win32.c \ - win32/gdkevents-win32.c \ - win32/gdkgeometry-win32.c \ - win32/gdkglobals-win32.c \ - win32/gdkkeys-win32.c \ - win32/gdkmain-win32.c \ - win32/gdkproperty-win32.c \ - win32/gdkscreen-win32.c \ - win32/gdkselection-win32.c \ - win32/gdktestutils-win32.c \ - win32/gdkwin32.h \ - win32/gdkwin32cursor.h \ - win32/gdkwin32display.h \ - win32/gdkwin32displaymanager.h \ - win32/gdkwin32dnd.h \ - win32/gdkwin32id.c \ - win32/gdkwin32keys.h \ - win32/gdkwin32misc.h \ - win32/gdkwin32screen.h \ - win32/gdkwin32window.h \ - win32/gdkwindow-win32.c - if OS_WIN32 GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile GdkWin32_3_0_gir_SCANNERFLAGS = \ diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc index e84c5d0fc3..9235edb6cf 100644 --- a/gdk/gdk-sources.inc +++ b/gdk/gdk-sources.inc @@ -1,7 +1,11 @@ # # GDK header files for public installation (non-generated) # + # +# setup source file variables +# + gdk_public_h_sources = \ gdk.h \ gdk-autocleanup.h \ @@ -42,3 +46,168 @@ gdk_public_h_sources = \ gdk_deprecated_h_sources = \ deprecated/gdkcolor.h + +gdk_h_sources = \ + $(gdk_public_h_sources) \ + $(gdk_deprecated_h_sources) + +gdk_private_headers = \ + gdk-private.h \ + gdkapplaunchcontextprivate.h \ + gdkconstructor.h \ + gdkcursorprivate.h \ + gdkdevicemanagerprivate.h \ + gdkdeviceprivate.h \ + gdkdevicepadprivate.h \ + gdkdevicetoolprivate.h \ + gdkdisplaymanagerprivate.h \ + gdkdisplayprivate.h \ + gdkdndprivate.h \ + gdkdrawingcontextprivate.h \ + gdkframeclockidle.h \ + gdkframeclockprivate.h \ + gdkglcontextprivate.h \ + gdkmonitorprivate.h \ + gdkprofilerprivate.h \ + gdkscreenprivate.h \ + gdkseatprivate.h \ + gdkseatdefaultprivate.h \ + gdkinternals.h \ + gdkintl.h \ + gdkkeysprivate.h \ + gdkvisualprivate.h \ + gdkx.h + +gdk_deprecated_c_sources = \ + deprecated/gdkcolor.c + +gdk_c_sources = \ + $(gdk_deprecated_c_sources) \ + gdk-private.c \ + gdk.c \ + gdkapplaunchcontext.c \ + gdkcairo.c \ + gdkcursor.c \ + gdkdeprecated.c \ + gdkdevice.c \ + gdkdevicepad.c \ + gdkdevicetool.c \ + gdkdevicemanager.c \ + gdkdisplay.c \ + gdkdisplaymanager.c \ + gdkdnd.c \ + gdkdrawingcontext.c \ + gdkevents.c \ + gdkframetimings.c \ + gdkgl.c \ + gdkglcontext.c \ + gdkglobals.c \ + gdkkeys.c \ + gdkkeyuni.c \ + gdkmonitor.c \ + gdkoffscreenwindow.c \ + gdkframeclock.c \ + gdkframeclockidle.c \ + gdkpango.c \ + gdkpixbuf-drawable.c \ + gdkprofiler.c \ + gdkproperty.c \ + gdkrectangle.c \ + gdkrgba.c \ + gdkscreen.c \ + gdkseat.c \ + gdkseatdefault.c \ + gdkselection.c \ + gdkvisual.c \ + gdkwindow.c \ + gdkwindowimpl.c + +gdk_built_sources = \ + gdkenumtypes.h \ + gdkenumtypes.c \ + gdkmarshalers.h \ + gdkmarshalers.c \ + gdkresources.h \ + gdkresources.c \ + gdkversionmacros.h + +x11_introspection_files = \ + x11/gdkapplaunchcontext-x11.c \ + x11/gdkasync.c \ + x11/gdkcursor-x11.c \ + x11/gdkdevice-core-x11.c \ + x11/gdkdevicemanager-core-x11.c \ + x11/gdkdevicemanager-x11.c \ + x11/gdkdevicemanager-xi2.c \ + x11/gdkdevice-xi2.c \ + x11/gdkdisplay-x11.c \ + x11/gdkdisplaymanager-x11.c \ + x11/gdkdnd-x11.c \ + x11/gdkeventsource.c \ + x11/gdkeventtranslator.c \ + x11/gdkgeometry-x11.c \ + x11/gdkglcontext-x11.c \ + x11/gdkkeys-x11.c \ + x11/gdkmain-x11.c \ + x11/gdkmonitor-x11.c \ + x11/gdkproperty-x11.c \ + x11/gdkscreen-x11.c \ + x11/gdkselection-x11.c \ + x11/gdksettings.c \ + x11/gdktestutils-x11.c \ + x11/gdkvisual-x11.c \ + x11/gdkwindow-x11.c \ + x11/gdkxftdefaults.c \ + x11/gdkxid.c \ + x11/xsettings-client.c \ + x11/gdkx.h \ + x11/gdkx11applaunchcontext.h \ + x11/gdkx11cursor.h \ + x11/gdkx11device.h \ + x11/gdkx11device-core.h \ + x11/gdkx11device-xi2.h \ + x11/gdkx11devicemanager.h \ + x11/gdkx11devicemanager-core.h \ + x11/gdkx11devicemanager-xi2.h \ + x11/gdkx11display.h \ + x11/gdkx11displaymanager.h \ + x11/gdkx11dnd.h \ + x11/gdkx11glcontext.h \ + x11/gdkx11keys.h \ + x11/gdkx11monitor.h \ + x11/gdkx11property.h \ + x11/gdkx11screen.h \ + x11/gdkx11selection.h \ + x11/gdkx11utils.h \ + x11/gdkx11visual.h \ + x11/gdkx11window.h + +w32_introspection_files = \ + win32/gdkcursor-win32.c \ + win32/gdkdevicemanager-win32.c \ + win32/gdkdevice-virtual.c \ + win32/gdkdevice-win32.c \ + win32/gdkdevice-wintab.c \ + win32/gdkdisplaymanager-win32.c \ + win32/gdkdisplay-win32.c \ + win32/gdkdnd-win32.c \ + win32/gdkevents-win32.c \ + win32/gdkgeometry-win32.c \ + win32/gdkglobals-win32.c \ + win32/gdkkeys-win32.c \ + win32/gdkmain-win32.c \ + win32/gdkproperty-win32.c \ + win32/gdkscreen-win32.c \ + win32/gdkselection-win32.c \ + win32/gdktestutils-win32.c \ + win32/gdkwin32.h \ + win32/gdkwin32cursor.h \ + win32/gdkwin32display.h \ + win32/gdkwin32displaymanager.h \ + win32/gdkwin32dnd.h \ + win32/gdkwin32id.c \ + win32/gdkwin32keys.h \ + win32/gdkwin32misc.h \ + win32/gdkwin32screen.h \ + win32/gdkwin32window.h \ + win32/gdkwindow-win32.c From 574bd57f726cbd6a024fe13fe95283f7ba1b10ba Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 18 May 2022 17:54:39 +0800 Subject: [PATCH 18/21] gtk-sources.inc: Split base sources in two parts Otherwise, NMake will choke when creating a filelist from it. This U1095 error is nasty! :| --- gtk/gtk-sources.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc index 91e511bf63..a073ada426 100644 --- a/gtk/gtk-sources.inc +++ b/gtk/gtk-sources.inc @@ -485,8 +485,10 @@ gtk_base_private_h_sources = \ language-names.h \ script-names.h -# GTK base sources -gtk_base_c_sources_base = \ +# GTK base sources (had to split those in 2 parts to avoid U1095 error :|, order unchanged from before) +# gtk_base_c_sources_base_gtka_gtkh: sources from gtka* to gtkh*, mostly +# gtk_base_c_sources_base_gtki_gtkw: sources from gtki* to gtkw*, mostly +gtk_base_c_sources_base_gtka_gtkh = \ gtkactionmuxer.c \ gtkactionobserver.c \ gtkactionobservable.c \ @@ -684,7 +686,9 @@ gtk_base_c_sources_base = \ gtkglarea.c \ gtkgrid.c \ gtkheaderbar.c \ - gtkhsla.c \ + gtkhsla.c + +gtk_base_c_sources_base_gtki_gtkw = \ gtkicon.c \ gtkiconcache.c \ gtkiconcachevalidator.c \ @@ -698,7 +702,7 @@ gtk_base_c_sources_base = \ gtkimmodule.c \ gtkimmulticontext.c \ gtkinfobar.c \ - gtkinvisible.c \ + gtkinvisible.c \ gtkkeyhash.c \ gtkkineticscrolling.c \ gtklabel.c \ @@ -856,6 +860,8 @@ gtk_base_c_sources_base = \ language-names.c \ script-names.c +gtk_base_c_sources_base = $(gtk_base_c_sources_base_gtka_gtkh) $(gtk_base_c_sources_base_gtki_gtkw) + # Clipboard/dnd platform-specific sources gtk_clipboard_dnd_c_sources_quartz = \ gtkclipboard-quartz.c \ From c05d21c9af23a73954ea027eb0408e15eafe89fd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 19 May 2022 10:23:59 +0800 Subject: [PATCH 19/21] gtk: Build: Prefix deprecated source listings ...with gtk_, so that they are distinguished from other names and is more clear to people. --- gtk/Makefile.am | 4 ++-- gtk/deprecated/Makefile.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 81d6ed2736..17788c82e5 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -136,7 +136,7 @@ gtk_private_h_sources = \ # GTK+ C sources to build the library from gtk_base_c_sources = \ $(a11y_c_sources) \ - $(deprecated_c_sources) \ + $(gtk_deprecated_c_sources) \ $(inspector_c_sources) \ $(gtk_base_c_sources_base) @@ -207,7 +207,7 @@ endif gtk_all_private_h_sources = \ $(a11y_private_h_sources) \ - $(deprecated_private_h_sources) \ + $(gtk_deprecated_private_h_sources) \ $(gtk_private_h_sources) \ $(gtk_use_x11_private_h_sources) \ $(gtk_use_win32_private_h_sources) \ diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index a4d5811ba2..d1cdc5cdce 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -40,14 +40,14 @@ gtk_deprecated_h_sources = \ deprecated/gtkvseparator.h \ deprecated/gtkvpaned.h -deprecated_private_h_sources = \ +gtk_deprecated_private_h_sources = \ deprecated/gtkgradientprivate.h \ deprecated/gtkiconfactoryprivate.h \ deprecated/gtknumerableiconprivate.h \ deprecated/gtkstylepropertiesprivate.h \ deprecated/gtksymboliccolorprivate.h -deprecated_c_sources = \ +gtk_deprecated_c_sources = \ deprecated/gtkactivatable.c \ deprecated/gtkaction.c \ deprecated/gtkactiongroup.c \ From fe548537f9c76dbd556eba829d2116fe99ec23f1 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 19 May 2022 11:22:12 +0800 Subject: [PATCH 20/21] build: Write introspection rules directly in NMake Makefiles By doing so, we can drop the autotools rules that we use to generate the file lists and rules for building introspection via NMake Makefiles for Visual Studio builds via the project files. --- win32/create-lists-msvc.mak | 61 ++++++++++++++++- win32/generate-msvc.mak | 4 +- win32/gtk-introspection-msvc.mak | 112 ++++++++++++++++++++++++++++--- 3 files changed, 164 insertions(+), 13 deletions(-) diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index 3fce81333a..3158c02544 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -33,7 +33,7 @@ NULL= -# For GDK enumeration sources +# For GDK public headers and sources !include ..\gdk\gdk-sources.inc !if [call create-lists.bat header gdk_headers.mak GDK_PUBLIC_HEADERS] @@ -45,9 +45,36 @@ NULL= !if [call create-lists.bat footer gdk_headers.mak] !endif -# For GDK-Win32 public headers +!if [call create-lists.bat header gdk_headers.mak GDK_C_SRCS] +!endif + +!if [for %f in ($(gdk_c_sources)) do @call create-lists.bat file gdk_headers.mak ../gdk/%f] +!endif + +!if [call create-lists.bat footer gdk_headers.mak] +!endif + +# For GDK-Win32 public headers and sources !include ..\gdk\win32\gdk-win32-sources.inc +!if [call create-lists.bat header gdk_headers.mak GDK_WIN32_PUBLIC_HEADERS] +!endif + +!if [for %f in ($(libgdkwin32include_HEADERS)) do @call create-lists.bat file gdk_headers.mak ../gdk/win32/%f] +!endif + +!if [call create-lists.bat footer gdk_headers.mak] +!endif + +!if [call create-lists.bat header gdk_headers.mak GDK_WIN32_INTROSPECTION_SRCS] +!endif + +!if [for %f in ($(w32_introspection_files)) do @call create-lists.bat file gdk_headers.mak ../gdk/%f] +!endif + +!if [call create-lists.bat footer gdk_headers.mak] +!endif + # For GDK-Broadway public headers !include ..\gdk\broadway\gdk-broadway-sources.inc @@ -70,10 +97,11 @@ NULL= !if [call create-lists.bat header resources_sources.mak GTK_RESOURCES] !endif -# For GTK enumeration sources +# For GTK public headers and sources !include ..\gtk\gtk-sources.inc !include ..\gtk\a11y\Makefile.inc !include ..\gtk\deprecated\Makefile.inc +!include ..\gtk\inspector\Makefile.inc !if [call create-lists.bat header gtk_headers.mak GTK_PUBLIC_ENUM_HEADERS] !endif @@ -96,6 +124,33 @@ NULL= !if [call create-lists.bat footer gtk_headers.mak] !endif +!if [call create-lists.bat header gtk_headers.mak GTK_SEMI_PRIVATE_HEADERS] +!endif + +!if [for %f in ($(gtk_semi_private_h_sources)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f] +!endif + +!if [call create-lists.bat footer gtk_headers.mak] +!endif + +!if [call create-lists.bat header gtk_headers.mak GTK_C_SRCS] +!endif + +!if [for %f in ($(a11y_c_sources) $(gtk_deprecated_c_sources) $(inspector_c_sources)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f] +!endif + +!if [for %f in ($(gtk_base_c_sources_base_gtka_gtkh:.c=)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f.c] +!endif + +!if [for %f in ($(gtk_base_c_sources_base_gtki_gtkw:.c=)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f.c] +!endif + +!if [for %f in ($(gtk_os_win32_c_sources)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f] +!endif + +!if [call create-lists.bat footer gtk_headers.mak] +!endif + !include gtk_headers.mak !if [del /f /q gtk_headers.mak] diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index 63cf6c5c00..67f610fd92 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -39,6 +39,8 @@ GDK_GENERATED_SOURCES = \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h +GTK_VERSION_H = .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h + GTK_TYPEBUILTIN_SOURCES = \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c @@ -54,7 +56,7 @@ GTK_GENERATED_SOURCES = \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h + $(GTK_VERSION_H) generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ diff --git a/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak index 07d0e2c762..abf122e0e0 100644 --- a/win32/gtk-introspection-msvc.mak +++ b/win32/gtk-introspection-msvc.mak @@ -29,19 +29,113 @@ AT_PLAT=aarch64 AT_PLAT=i686 !endif -introspect: setgirbuildenv $(built_install_girs) $(built_install_typelibs) +vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist: $(GDK_PUBLIC_HEADERS) $(GDK_C_SRCS) $(GDK_GENERATED_SOURCES) + @if exist $@ del $@ + @for %f in ($(gdk_h_sources:/=\) $(gdk_c_sources:/=\)) do @if not "%f" == "gdkkeysyms-compat.h" echo ..\gdk\%f>>$@ + @for %f in ($(GDK_GENERATED_SOURCES)) do @if not "%~nxf" == "gdkconfig.h" echo %f>>$@ -setgirbuildenv: +vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist: $(GDK_WIN32_INTROSPECTION_SRCS) + @if exist $@ del $@ + @for %f in ($(w32_introspection_files:/=\)) do @echo ..\gdk\%f>>$@ + +vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist: \ +$(GTK_PUBLIC_ENUM_HEADERS) $(GTK_SEMI_PRIVATE_HEADERS) \ +$(GTK_GENERATED_PUB_HDRS) $(GTK_C_SRCS) + @if exist $@ del $@ + @for %f in ($(GTK_PUB_HDRS:.h=)) do @if not "%f" == "gtktextdisplay" if not "%f" == "gtkx" echo ..\gtk\%f.h>>$@ + @for %f in ($(a11y_h_sources:/=\) $(gtk_deprecated_h_sources:/=\) $(gtk_semi_private_h_sources)) do @if not "%f" == "gtktextlayout.h" echo ..\gtk\%f>>$@ + @for %f in ($(a11y_c_sources:/=\) $(gtk_deprecated_c_sources:/=\) $(inspector_c_sources:/=\)) do @echo ..\gtk\%f>>$@ + @for %f in ($(gtk_base_c_sources_base_gtka_gtkh:.c=)) do @echo ..\gtk\%f.c>>$@ + @for %f in ($(gtk_base_c_sources_base_gtki_gtkw:.c=)) do @echo ..\gtk\%f.c>>$@ + @for %f in ($(gtk_clipboard_dnd_c_sources_generic) $(gtk_os_win32_c_sources)) do @echo ..\gtk\%f>>$@ + @for %f in ($(GTK_TYPEBUILTIN_SOURCES) $(GTK_VERSION_H)) do @echo %f>>$@ + +vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist + @-echo Generating $@... @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) + @$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ + --namespace=Gdk --nsversion=$(APIVERSION) \ + --library=gdk-$(APIVERSION) \ + --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ + --add-include-path=$(G_IR_INCLUDEDIR) \ + --include=Gio-2.0 --include=GdkPixbuf-2.0 --include=Pango-1.0 --include=cairo-1.0 \ + --cflags-begin \ + -DG_LOG_USE_STRUCTURED=1 -DGDK_COMPILATION -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ + -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk -I../gdk/win32 \ + --cflags-end \ + --c-include=gdk/gdk.h \ + --filelist=$** \ + -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ + -o $@ -!include introspection.body.mak +vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir: \ +./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ +vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist + @-echo Generating $@... + @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection + @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) + @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) + @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) + $(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ + --namespace=GdkWin32 --nsversion=$(APIVERSION) \ + --library=gdk-$(APIVERSION) \ + --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ + --add-include-path=$(G_IR_INCLUDEDIR) \ + --cflags-begin \ + -DG_LOG_USE_STRUCTURED=1 -DGDK_COMPILATION -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ + -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk -I../gdk/win32 \ + --cflags-end \ + --identifier-prefix=Gdk --c-include=gdk/gdkwin32.h \ + --include-uninstalled=./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ + --filelist=vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist \ + -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ + -o $@ -install-introspection: introspect - @-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)" - @-copy /b vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib "$(G_IR_TYPELIBDIR)" +vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir: \ +./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ +vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist + @-echo Generating $@... + @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection + @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) + @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) + @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) + $(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool \ + --namespace=Gtk --nsversion=$(APIVERSION) \ + --library=gtk-$(APIVERSION) --library=gdk-$(APIVERSION) \ + --add-include-path=./vs$(VSVER)/$(CFG)/$(PLAT)/bin \ + --add-include-path=$(G_IR_INCLUDEDIR) \ + --include=Atk-1.0 \ + --pkg-export=gtk+-$(APIVERSION) \ + --cflags-begin \ + -DG_LOG_USE_STRUCTURED=1 -DGTK_VERSION="$(GTK_VERSION)" -DGTK_BINARY_VERSION="3.0.0" -DGTK_COMPILATION \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED -DGTK_LIBDIR=\"/dummy/lib\" -DGTK_DATADIR=\"/dummy/share\" \ + -DGTK_DATA_PREFIX=\"/dummy\" -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_HOST=\"$(AT_PLAT)-pc-vs$(VSVER)\" \ + -DGTK_PRINT_BACKENDS=\"file\" -DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit \ + -DINCLUDE_IM_ime -DINCLUDE_IM_inuktitu -DINCLUDE_IM_ipa -DINCLUDE_IM_multipress -DINCLUDE_IM_thai \ + -DINCLUDE_IM_ti_er -DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr \ + -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ + -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gtk-3 \ + -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3 \ + -I.. -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gtk-3/gtk -I../gtk \ + -I./vs$(VSVER)/$(CFG)/$(PLAT)/obj/gdk-3/gdk -I../gdk \ + --cflags-end \ + --warn-all --include-uninstalled=./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-$(APIVERSION).gir \ + --filelist=vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist \ + -L.\vs$(VSVER)\$(CFG)\$(PLAT)\bin \ + -o $@ + +vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir +vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir +vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir + +$(built_install_typelibs): + @-echo Compiling $@... + $(G_IR_COMPILER) --includedir=$(@D:\=/) --debug --verbose $(@R:\=/).gir -o $@ + +introspect: $(built_install_girs) $(built_install_typelibs) !else introspect: @@ -49,8 +143,8 @@ introspect: !endif introspect-clean: - @-del /f/q Gtk_3_0_gir_list_final - @-del /f/q GdkWin32_3_0_gir_list_final - @-del /f/q Gdk_3_0_gir_list_final + @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\Gtk-$(APIVERSION).gir.filelist + @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk3-win32\GdkWin32-$(APIVERSION).gir.filelist + @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\Gdk-$(APIVERSION).gir.filelist @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir From ff847c43adf75353033f2692c7abe875cc8297d3 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 19 May 2022 11:33:25 +0800 Subject: [PATCH 21/21] Drop win32/Makefile.msvc-introspection We no longer use the autotools 'dist-hook' to generate the items that we need to build introspection with the Visual Studio projects, so drop the autotools files and bits that we had to support this. So, for introspection on Visual Studio via the project files, it is purely via NMake at this point. --- gdk/Makefile.am | 42 +--------- gtk/Makefile.am | 54 +------------ win32/Makefile.am | 29 +------ win32/Makefile.msvc-introspection | 128 ------------------------------ win32/generate-msvc.mak | 14 ---- 5 files changed, 3 insertions(+), 264 deletions(-) delete mode 100644 win32/Makefile.msvc-introspection diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3e9f90a280..e5eb5e43a6 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -293,48 +293,8 @@ gdk_3_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj -if HAVE_INTROSPECTION -# Introspection Items for MSVC -MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir - -BASE_MSVC_GIR_CFLAGS = \ - $(GDK_CFLAGS_DEFINES) \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3' -I.. \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3/gdk' -I../gdk \ - -I../gdk/win32 - -INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/win32/Gdk-3.0.gir.msvc.introspect \ - $(top_builddir)/win32/Gdk_3_0_gir_list \ - $(top_builddir)/win32/GdkWin32-3.0.gir.msvc.introspect \ - $(top_builddir)/win32/GdkWin32_3_0_gir_list - -Gdk_3_0_gir_MSVC_FILES = $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ - $(gdk_c_sources) \ -Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES) -Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES) -Gdk_3_0_gir_MSVC_LIBS = gdk-3.0 -Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) -Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS) - -GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files) -GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES) -GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS) -GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) -GdkWin32_3_0_gir_MSVC_SCANNERFLAGS = \ - --identifier-prefix=Gdk \ - --c-include="gdk/gdkwin32.h" \ - --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir' - -include $(top_srcdir)/win32/Makefile.msvc-introspection - -else -INTROSPECTION_INTERMEDIATE_ITEMS = -endif - dist-hook: \ - $(top_builddir)/win32/vs9/gdk-3.vcproj \ - $(INTROSPECTION_INTERMEDIATE_ITEMS) + $(top_builddir)/win32/vs9/gdk-3.vcproj DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 17788c82e5..7474ed0d2b 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -529,60 +529,8 @@ gtk_3_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj -if HAVE_INTROSPECTION -# Introspection Items for MSVC -MSVC_INTROSPECT_GIRS = Gtk-3.0.gir - -GTK_MSVC_GIR_CFLAGS = \ - $(GTK_BASE_CFLAGS_DEFINES) \ - -DGTK_LIBDIR=\\\"/dummy/lib\\\" \ - -DGTK_DATADIR=\\\"/dummy/share\\\" \ - -DGTK_DATA_PREFIX=\\\"/dummy\\\" \ - -DGTK_SYSCONFDIR=\\\"/dummy/etc\\\" \ - -DGTK_HOST=\\\"'$$$$(AT_PLAT)'-pc-vs'$$$$(VSVER)'\\\" \ - -DGTK_PRINT_BACKENDS=\\\"file\\\" \ - -DINCLUDE_IM_am_et \ - -DINCLUDE_IM_cedilla \ - -DINCLUDE_IM_cyrillic_translit \ - -DINCLUDE_IM_ime \ - -DINCLUDE_IM_inuktitu \ - -DINCLUDE_IM_ipa \ - -DINCLUDE_IM_multipress \ - -DINCLUDE_IM_thai \ - -DINCLUDE_IM_ti_er \ - -DINCLUDE_IM_ti_et \ - -DINCLUDE_IM_viqr \ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gtk-3' \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3' -I.. \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gtk-3/gtk' -I../gtk \ - -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3/gdk' -I../gdk - -INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/win32/Gtk-3.0.gir.msvc.introspect \ - $(top_builddir)/win32/Gtk_3_0_gir_list - -Gtk_3_0_gir_MSVC_FILES = \ - $(filter-out gtktypebuiltins.h gtkversion.h, $(introspected_pub_headers)) \ - $(gtk_base_c_sources) \ - $(gtk_os_win32_c_sources) - -Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES) -Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0 -Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0 -Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS) -Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir' - -include $(top_srcdir)/win32/Makefile.msvc-introspection - -else -INTROSPECTION_INTERMEDIATE_ITEMS = - -endif - dist-hook: \ - $(top_builddir)/win32/vs9/gtk-3.vcproj \ - $(INTROSPECTION_INTERMEDIATE_ITEMS) + $(top_builddir)/win32/vs9/gtk-3.vcproj # Install a RC file for the default GTK+ theme, and key themes install-data-local: install-ms-lib install-def-file install-mac-key-theme diff --git a/win32/Makefile.am b/win32/Makefile.am index 98424c3771..bc7a513ad5 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,31 +1,5 @@ include $(top_srcdir)/Makefile.decl -if HAVE_INTROSPECTION -GENERATED_ITEMS = \ - introspection.body.mak \ - Gdk_3_0_gir_list \ - GdkWin32_3_0_gir_list \ - Gtk_3_0_gir_list - -MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-3.0.gir.msvc.introspect GdkWin32-3.0.gir.msvc.introspect Gtk-3.0.gir.msvc.introspect - -introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) - -$(RM) introspection.body.mak - for F in `ls *.msvc.introspect`; do \ - case $$F in \ - *) cat $(top_builddir)/win32/$$F >>introspection.body.mak \ - ;; \ - esac; \ - done - $(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) - -DISTCLEANFILES = $(GENERATED_ITEMS) - -else -GENERATED_ITEMS = -DISTCLEANFILES = -endif - SUBDIRS = \ vs9 \ vs10 \ @@ -51,7 +25,6 @@ EXTRA_DIST += \ replace.py \ pc_base.py \ gtkpc.py \ - README_FEATURES_MSVC.txt \ - $(GENERATED_ITEMS) + README_FEATURES_MSVC.txt -include $(top_srcdir)/git.mk diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection deleted file mode 100644 index e472ac795e..0000000000 --- a/win32/Makefile.msvc-introspection +++ /dev/null @@ -1,128 +0,0 @@ -# Author: Fan, Chun-wei -# Common autotools file for constructing the g-ir-scanner and -# g-ir-compiler command lines for Visual Studio builds. - -# This is copied from $(srcroot)/build from the gobject-introspection -# project, which may be included in projects that support both -# Visual Studio builds and introspection. - -# * Input variables: -# -# MSVC_INTROSPECT_GIRS - List of .gir's that should be built -# in the NMake Makefiles -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM -# is required unless --headers-only is specified in -# YourLib_1_0_gir__MSVC_SCANNERFLAGS) -# -# include $(top_srcdir)/build/Makefile.msvc-introspection -# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir -# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional -# YourLib_1_0_gir_VERSION = 1.0 # This is optional -# YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0 -# YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES) -# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram -# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files) -# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's) -# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir) - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) - -# Namespace and Version is either fetched from the gir filename -# or the _NAMESPACE/_VERSION variable combo -_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1))))) -_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=)))) -_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc) - -# _PROGRAM is an optional variable which needs its own --program argument -_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM)) - -# Deduce the sub-folder from $(srcroot) where the sources reside in -_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc)) -_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\) -_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc)) - -_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES)) -_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc)))) - -# Create a list of items for: -# - Libraries -# - Packages -# - GIRs to include -# - packages to export - -_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib)) -_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg)) -_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include)) -_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg)) - -# -# Create NMake Makefile Sections for Building Introspection files -# from autotools files -# $(1) - File Name of the .gir that is to be generated -# - -define gir-nmake-builder - -# Basic sanity check, to make sure required variables are set -$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES)) -$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), - $($(_gir_name)_MSVC_LIBS), - $($(_gir_name)_MSVC_PROGRAM)),, - $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) - -$(top_builddir)/win32/$(_gir_name)_list: Makefile - rm -f $(top_builddir)/win32/$(_gir_name)_list - for F in $(_gir_files_msvc); do \ - case $$$$F in \ - *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \ - echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \ - ;; \ - esac; \ - done - -$(top_builddir)/win32/$(1).msvc.introspect: Makefile - -$(RM) $(top_builddir)/win32/$(1).msvc.introspect - -# Assemble the Command to Run g-ir-scanner - echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list_final '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --filelist='$(_gir_name)'_list_final \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' -L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/win32/$(1).msvc.introspect - -# Finally Assemble the Command to Compile the generated .gir - echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --includedir=$$$$(@D:\=/) --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' $$$$(@R:\=/).gir \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/win32/$(1).msvc.introspect -endef - -$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index 67f610fd92..fe1523019c 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -299,20 +299,6 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs16\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v142<" @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs17\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v143<" -Gdk_3_0_gir_list_final: Gdk_3_0_gir_list $(GDK_GENERATED_SOURCES) - @echo Generating $@... - @type Gdk_3_0_gir_list>$@ - @for %%s in ($(GDK_GENERATED_SOURCES)) do echo %%s>>$@ - -Gtk_3_0_gir_list_final: Gtk_3_0_gir_list $(GTK_TYPEBUILTIN_SOURCES) - @echo Generating $@... - @type Gtk_3_0_gir_list>$@ - @for %%s in ($(GTK_TYPEBUILTIN_SOURCES) .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h) do echo %%s>>$@ - -GdkWin32_3_0_gir_list_final: GdkWin32_3_0_gir_list - @echo Copying $@... - @copy $** $@ - # Remove the generated files clean: @-del /f /q ..\demos\icon-browser\resources.c