diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 710a5488ae..860973b73e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,5 +1,7 @@ ## Makefile.am for gtk+/gdk include $(top_srcdir)/Makefile.decl +include gdk-pub-headers.mak + -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ENV = \ @@ -63,54 +65,10 @@ LDADD = \ # # setup source file variables # -# -# GDK header files for public installation (non-generated) -# -# -gdk_public_h_sources = \ - gdk.h \ - gdk-autocleanup.h \ - gdkapplaunchcontext.h \ - gdkcairo.h \ - gdkcursor.h \ - gdkdevice.h \ - gdkdevicepad.h \ - gdkdevicetool.h \ - gdkdevicemanager.h \ - gdkdisplay.h \ - gdkdisplaymanager.h \ - gdkdnd.h \ - gdkdrawingcontext.h \ - gdkevents.h \ - gdkframetimings.h \ - gdkglcontext.h \ - gdkkeys.h \ - gdkkeysyms.h \ - gdkkeysyms-compat.h \ - gdkmain.h \ - gdkmonitor.h \ - gdkpango.h \ - gdkframeclock.h \ - gdkpixbuf.h \ - gdkprivate.h \ - gdkproperty.h \ - gdkrectangle.h \ - gdkrgba.h \ - gdkscreen.h \ - gdkseat.h \ - gdkselection.h \ - gdktestutils.h \ - gdkthreads.h \ - gdktypes.h \ - gdkvisual.h \ - gdkwindow.h - -deprecated_h_sources = \ - deprecated/gdkcolor.h gdk_h_sources = \ $(gdk_public_h_sources) \ - $(deprecated_h_sources) + $(gdk_deprecated_h_sources) gdk_private_headers = \ gdk-private.h \ @@ -201,7 +159,7 @@ gdkinclude_HEADERS = $(gdk_public_h_sources) nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated -deprecatedinclude_HEADERS = $(deprecated_h_sources) +deprecatedinclude_HEADERS = $(gdk_deprecated_h_sources) common_sources = \ $(gdk_private_headers) \ @@ -499,14 +457,13 @@ gdkresources.c: gdk.gresource.xml $(resource_files) # ------------------- MSVC Build Items ---------------- MSVCPROJS = gdk-3 -gdk_3_FILES = $(libgdk_3_la_SOURCES) +gdk_3_FILES = $(gdk_c_sources) gdk_3_EXCLUDES = dummy gdk_3_HEADERS_DIR = $(gdkincludedir) gdk_3_HEADERS_INST = \ $(gdkinclude_HEADERS) \ - $(deprecatedinclude_HEADERS) \ - $(nodist_gdkinclude_HEADERS) + $(deprecatedinclude_HEADERS) gdk_3_HEADERS_EXCLUDES = dummy @@ -518,7 +475,9 @@ MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir BASE_MSVC_GIR_CFLAGS = \ $(GDK_CFLAGS_DEFINES) \ - -I.. -I../gdk -I../gdk/win32 + -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 \ @@ -526,7 +485,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \ $(top_builddir)/win32/GdkWin32-3.0.gir.msvc.introspect \ $(top_builddir)/win32/GdkWin32_3_0_gir_list -Gdk_3_0_gir_MSVC_FILES = $(introspection_files) +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 diff --git a/gdk/gdk-pub-headers.mak b/gdk/gdk-pub-headers.mak new file mode 100644 index 0000000000..e84c5d0fc3 --- /dev/null +++ b/gdk/gdk-pub-headers.mak @@ -0,0 +1,44 @@ +# +# GDK header files for public installation (non-generated) +# +# +gdk_public_h_sources = \ + gdk.h \ + gdk-autocleanup.h \ + gdkapplaunchcontext.h \ + gdkcairo.h \ + gdkcursor.h \ + gdkdevice.h \ + gdkdevicepad.h \ + gdkdevicetool.h \ + gdkdevicemanager.h \ + gdkdisplay.h \ + gdkdisplaymanager.h \ + gdkdnd.h \ + gdkdrawingcontext.h \ + gdkevents.h \ + gdkframetimings.h \ + gdkglcontext.h \ + gdkkeys.h \ + gdkkeysyms.h \ + gdkkeysyms-compat.h \ + gdkmain.h \ + gdkmonitor.h \ + gdkpango.h \ + gdkframeclock.h \ + gdkpixbuf.h \ + gdkprivate.h \ + gdkproperty.h \ + gdkrectangle.h \ + gdkrgba.h \ + gdkscreen.h \ + gdkseat.h \ + gdkselection.h \ + gdktestutils.h \ + gdkthreads.h \ + gdktypes.h \ + gdkvisual.h \ + gdkwindow.h + +gdk_deprecated_h_sources = \ + deprecated/gdkcolor.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 057c21d6c8..8fde3a0f42 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -114,236 +114,12 @@ endif include $(srcdir)/a11y/Makefile.inc include $(srcdir)/deprecated/Makefile.inc include $(srcdir)/inspector/Makefile.inc +include $(srcdir)/gtk-mkenums-headers.mak # GTK+ header files for public installation (non-generated, or generated # by configure) -gtk_public_h_sources = \ - gtk.h \ - gtk-autocleanups.h \ - gtkx.h \ - gtkx-autocleanups.h \ - gtk-a11y.h \ - gtkaboutdialog.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ - gtkaccelmap.h \ - gtkaccessible.h \ - gtkactionable.h \ - gtkactionbar.h \ - gtkadjustment.h \ - gtkappchooser.h \ - gtkappchooserbutton.h \ - gtkappchooserdialog.h \ - gtkappchooserwidget.h \ - gtkapplication.h \ - gtkapplicationwindow.h \ - gtkaspectframe.h \ - gtkassistant.h \ - gtkbbox.h \ - gtkbin.h \ - gtkbindings.h \ - gtkborder.h \ - gtkbox.h \ - gtkbuilder.h \ - gtkbuildable.h \ - gtkbutton.h \ - gtkcalendar.h \ - gtkcellarea.h \ - gtkcellareacontext.h \ - gtkcellareabox.h \ - gtkcelleditable.h \ - gtkcelllayout.h \ - gtkcellrenderer.h \ - gtkcellrendereraccel.h \ - gtkcellrenderercombo.h \ - gtkcellrendererpixbuf.h \ - gtkcellrendererprogress.h \ - gtkcellrendererspin.h \ - gtkcellrendererspinner.h\ - gtkcellrenderertext.h \ - gtkcellrenderertoggle.h \ - gtkcellview.h \ - gtkcheckbutton.h \ - gtkcheckmenuitem.h \ - gtkclipboard.h \ - gtkcolorbutton.h \ - gtkcolorchooser.h \ - gtkcolorchooserwidget.h \ - gtkcolorchooserdialog.h \ - gtkcolorutils.h \ - gtkcombobox.h \ - gtkcomboboxtext.h \ - gtkcontainer.h \ - gtkcssprovider.h \ - gtkcsssection.h \ - gtkdebug.h \ - gtkdialog.h \ - gtkdnd.h \ - gtkdragdest.h \ - gtkdragsource.h \ - gtkdrawingarea.h \ - gtkeditable.h \ - gtkentry.h \ - gtkentrybuffer.h \ - gtkentrycompletion.h \ - gtkenums.h \ - gtkeventbox.h \ - gtkeventcontroller.h \ - gtkeventcontrollerkey.h \ - gtkeventcontrollermotion.h \ - gtkeventcontrollerscroll.h \ - gtkexpander.h \ - gtkfilechooser.h \ - gtkfilechooserbutton.h \ - gtkfilechooserdialog.h \ - gtkfilechoosernative.h \ - gtkfilechooserwidget.h \ - gtkfilefilter.h \ - gtkfixed.h \ - gtkflowbox.h \ - gtkfontbutton.h \ - gtkfontchooser.h \ - gtkfontchooserdialog.h \ - gtkfontchooserwidget.h \ - gtkframe.h \ - gtkgesture.h \ - gtkgesturedrag.h \ - gtkgesturelongpress.h \ - gtkgesturemultipress.h \ - gtkgesturepan.h \ - gtkgesturerotate.h \ - gtkgesturesingle.h \ - gtkgesturestylus.h \ - gtkgestureswipe.h \ - gtkgesturezoom.h \ - gtkglarea.h \ - gtkgrid.h \ - gtkheaderbar.h \ - gtkicontheme.h \ - gtkiconview.h \ - gtkimage.h \ - gtkimcontext.h \ - gtkimcontextinfo.h \ - gtkimcontextsimple.h \ - gtkimmodule.h \ - gtkimmulticontext.h \ - gtkinfobar.h \ - gtkinvisible.h \ - gtklabel.h \ - gtklayout.h \ - gtklevelbar.h \ - gtklinkbutton.h \ - gtklistbox.h \ - gtkliststore.h \ - gtklockbutton.h \ - gtkmain.h \ - gtkmenu.h \ - gtkmenubar.h \ - gtkmenubutton.h \ - gtkmenuitem.h \ - gtkmenushell.h \ - gtkmenutoolbutton.h \ - gtkmessagedialog.h \ - gtkmodelbutton.h \ - gtkmodules.h \ - gtkmountoperation.h \ - gtknativedialog.h \ - gtknotebook.h \ - gtkoffscreenwindow.h \ - gtkorientable.h \ - gtkoverlay.h \ - gtkpadcontroller.h \ - gtkpagesetup.h \ - gtkpaned.h \ - gtkpapersize.h \ - gtkplacessidebar.h \ - gtkplug.h \ - gtkpopover.h \ - gtkpopovermenu.h \ - gtkprintcontext.h \ - gtkprintoperation.h \ - gtkprintoperationpreview.h \ - gtkprintsettings.h \ - gtkprogressbar.h \ - gtkradiobutton.h \ - gtkradiomenuitem.h \ - gtkradiotoolbutton.h \ - gtkrange.h \ - gtkrecentchooser.h \ - gtkrecentchooserdialog.h \ - gtkrecentchoosermenu.h \ - gtkrecentchooserwidget.h \ - gtkrecentfilter.h \ - gtkrecentmanager.h \ - gtkrender.h \ - gtkrevealer.h \ - gtkscale.h \ - gtkscalebutton.h \ - gtkscrollable.h \ - gtkscrollbar.h \ - gtkscrolledwindow.h \ - gtksearchbar.h \ - gtksearchentry.h \ - gtkselection.h \ - gtkseparator.h \ - gtkseparatormenuitem.h \ - gtkseparatortoolitem.h \ - gtksettings.h \ - gtkshortcutlabel.h \ - gtkshortcutsgroup.h \ - gtkshortcutssection.h \ - gtkshortcutsshortcut.h \ - gtkshortcutswindow.h \ - gtkshow.h \ - gtkstacksidebar.h \ - gtksizegroup.h \ - gtksizerequest.h \ - gtksocket.h \ - gtkspinbutton.h \ - gtkspinner.h \ - gtkstack.h \ - gtkstackswitcher.h \ - gtkstatusbar.h \ - gtkstylecontext.h \ - gtkstyleprovider.h \ - gtkswitch.h \ - gtktestutils.h \ - gtktextattributes.h \ - gtktextbuffer.h \ - gtktextbufferrichtext.h \ - gtktextchild.h \ - gtktextdisplay.h \ - gtktextiter.h \ - gtktextmark.h \ - gtktexttag.h \ - gtktexttagtable.h \ - gtktextview.h \ - gtktogglebutton.h \ - gtktoggletoolbutton.h \ - gtktoolbar.h \ - gtktoolbutton.h \ - gtktoolitem.h \ - gtktoolitemgroup.h \ - gtktoolpalette.h \ - gtktoolshell.h \ - gtktooltip.h \ - gtktreednd.h \ - gtktreemodel.h \ - gtktreemodelfilter.h \ - gtktreemodelsort.h \ - gtktreeselection.h \ - gtktreesortable.h \ - gtktreestore.h \ - gtktreeview.h \ - gtktreeviewcolumn.h \ - gtktypes.h \ - gtkviewport.h \ - gtkvolumebutton.h \ - gtkwidget.h \ - gtkwidgetpath.h \ - gtkwindow.h \ - gtkwindowgroup.h +gtk_public_h_sources = $(GTK_PUB_HDRS) if OS_UNIX gtk_unix_print_public_h_sources = \ @@ -360,10 +136,7 @@ endif gtk_semi_private_h_sources = \ gtktextlayout.h -gtk_private_type_h_sources = \ - gtkcsstypesprivate.h \ - gtktexthandleprivate.h - +gtk_private_type_h_sources = $(GTK_PRIVATE_TYPE_HDRS) # GTK+ header files that don't get installed gtk_private_h_sources = \ @@ -1277,15 +1050,15 @@ gtkmarshalers.c: gtkmarshalers.list gtktypebuiltins.h: stamp-gtktypebuiltins.h @true -stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template +stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \ + $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \ && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ && rm -f xgen-gtbh \ && echo timestamp > $(@F) -gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template +gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \ + $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \ && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc @@ -1470,7 +1243,7 @@ a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y a11yinclude_HEADERS= $(a11y_h_sources) deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated -deprecatedinclude_HEADERS= $(deprecated_h_sources) +deprecatedinclude_HEADERS= $(gtk_deprecated_h_sources) gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) @@ -1514,19 +1287,17 @@ MSVCPROJS = gtk-3 gtk_3_FILES = \ $(gtk_base_c_sources) \ $(gtk_os_win32_c_sources) \ - $(gtk_use_win32_c_sources) \ - $(gtk_dbus_built_sources) \ - $(gtk_built_sources) + $(gtk_use_win32_c_sources) gtk_3_EXCLUDES = dummy gtk_3_HEADERS_DIR = $(gtkincludedir) gtk_3_HEADERS_INST = \ - $(gtkinclude_HEADERS) \ + $(filter-out gtkversion.h, $(gtkinclude_HEADERS)) \ $(a11y_h_sources) \ - $(deprecated_h_sources) + $(gtk_deprecated_h_sources) -gtk_3_HEADERS_EXCLUDES = dummy +gtk_3_HEADERS_EXCLUDES = gtktypebuiltins.h include $(top_srcdir)/win32/Makefile.msvcproj @@ -1554,18 +1325,19 @@ GTK_MSVC_GIR_CFLAGS = \ -DINCLUDE_IM_ti_et \ -DINCLUDE_IM_viqr \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ - -I.. -I../gtk -I../gdk + -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 = \ - $(introspected_pub_headers) \ + $(filter-out gtktypebuiltins.h gtkversion.h, $(introspected_pub_headers)) \ $(gtk_base_c_sources) \ - $(gtk_os_win32_c_sources) \ - gtktypebuiltins.h \ - gtktypebuiltins.c + $(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 diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index 7e0e08bdd0..a4d5811ba2 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -1,4 +1,4 @@ -deprecated_h_sources = \ +gtk_deprecated_h_sources = \ deprecated/gtkactivatable.h \ deprecated/gtkaction.h \ deprecated/gtkactiongroup.h \ diff --git a/gtk/gtk-mkenums-headers.mak b/gtk/gtk-mkenums-headers.mak new file mode 100644 index 0000000000..86c38f925c --- /dev/null +++ b/gtk/gtk-mkenums-headers.mak @@ -0,0 +1,236 @@ +# List of headers to be passed into glib-mkenums + + +# GTK+ header files for public installation (non-generated, or generated +# by configure) + +GTK_PUB_HDRS = \ + gtk.h \ + gtk-autocleanups.h \ + gtkx.h \ + gtkx-autocleanups.h \ + gtk-a11y.h \ + gtkaboutdialog.h \ + gtkaccelgroup.h \ + gtkaccellabel.h \ + gtkaccelmap.h \ + gtkaccessible.h \ + gtkactionable.h \ + gtkactionbar.h \ + gtkadjustment.h \ + gtkappchooser.h \ + gtkappchooserbutton.h \ + gtkappchooserdialog.h \ + gtkappchooserwidget.h \ + gtkapplication.h \ + gtkapplicationwindow.h \ + gtkaspectframe.h \ + gtkassistant.h \ + gtkbbox.h \ + gtkbin.h \ + gtkbindings.h \ + gtkborder.h \ + gtkbox.h \ + gtkbuilder.h \ + gtkbuildable.h \ + gtkbutton.h \ + gtkcalendar.h \ + gtkcellarea.h \ + gtkcellareacontext.h \ + gtkcellareabox.h \ + gtkcelleditable.h \ + gtkcelllayout.h \ + gtkcellrenderer.h \ + gtkcellrendereraccel.h \ + gtkcellrenderercombo.h \ + gtkcellrendererpixbuf.h \ + gtkcellrendererprogress.h \ + gtkcellrendererspin.h \ + gtkcellrendererspinner.h\ + gtkcellrenderertext.h \ + gtkcellrenderertoggle.h \ + gtkcellview.h \ + gtkcheckbutton.h \ + gtkcheckmenuitem.h \ + gtkclipboard.h \ + gtkcolorbutton.h \ + gtkcolorchooser.h \ + gtkcolorchooserwidget.h \ + gtkcolorchooserdialog.h \ + gtkcolorutils.h \ + gtkcombobox.h \ + gtkcomboboxtext.h \ + gtkcontainer.h \ + gtkcssprovider.h \ + gtkcsssection.h \ + gtkdebug.h \ + gtkdialog.h \ + gtkdnd.h \ + gtkdragdest.h \ + gtkdragsource.h \ + gtkdrawingarea.h \ + gtkeditable.h \ + gtkentry.h \ + gtkentrybuffer.h \ + gtkentrycompletion.h \ + gtkenums.h \ + gtkeventbox.h \ + gtkeventcontroller.h \ + gtkeventcontrollerkey.h \ + gtkeventcontrollermotion.h \ + gtkeventcontrollerscroll.h \ + gtkexpander.h \ + gtkfilechooser.h \ + gtkfilechooserbutton.h \ + gtkfilechooserdialog.h \ + gtkfilechoosernative.h \ + gtkfilechooserwidget.h \ + gtkfilefilter.h \ + gtkfixed.h \ + gtkflowbox.h \ + gtkfontbutton.h \ + gtkfontchooser.h \ + gtkfontchooserdialog.h \ + gtkfontchooserwidget.h \ + gtkframe.h \ + gtkgesture.h \ + gtkgesturedrag.h \ + gtkgesturelongpress.h \ + gtkgesturemultipress.h \ + gtkgesturepan.h \ + gtkgesturerotate.h \ + gtkgesturesingle.h \ + gtkgesturestylus.h \ + gtkgestureswipe.h \ + gtkgesturezoom.h \ + gtkglarea.h \ + gtkgrid.h \ + gtkheaderbar.h \ + gtkicontheme.h \ + gtkiconview.h \ + gtkimage.h \ + gtkimcontext.h \ + gtkimcontextinfo.h \ + gtkimcontextsimple.h \ + gtkimmodule.h \ + gtkimmulticontext.h \ + gtkinfobar.h \ + gtkinvisible.h \ + gtklabel.h \ + gtklayout.h \ + gtklevelbar.h \ + gtklinkbutton.h \ + gtklistbox.h \ + gtkliststore.h \ + gtklockbutton.h \ + gtkmain.h \ + gtkmenu.h \ + gtkmenubar.h \ + gtkmenubutton.h \ + gtkmenuitem.h \ + gtkmenushell.h \ + gtkmenutoolbutton.h \ + gtkmessagedialog.h \ + gtkmodelbutton.h \ + gtkmodules.h \ + gtkmountoperation.h \ + gtknativedialog.h \ + gtknotebook.h \ + gtkoffscreenwindow.h \ + gtkorientable.h \ + gtkoverlay.h \ + gtkpadcontroller.h \ + gtkpagesetup.h \ + gtkpaned.h \ + gtkpapersize.h \ + gtkplacessidebar.h \ + gtkplug.h \ + gtkpopover.h \ + gtkpopovermenu.h \ + gtkprintcontext.h \ + gtkprintoperation.h \ + gtkprintoperationpreview.h \ + gtkprintsettings.h \ + gtkprogressbar.h \ + gtkradiobutton.h \ + gtkradiomenuitem.h \ + gtkradiotoolbutton.h \ + gtkrange.h \ + gtkrecentchooser.h \ + gtkrecentchooserdialog.h \ + gtkrecentchoosermenu.h \ + gtkrecentchooserwidget.h \ + gtkrecentfilter.h \ + gtkrecentmanager.h \ + gtkrender.h \ + gtkrevealer.h \ + gtkscale.h \ + gtkscalebutton.h \ + gtkscrollable.h \ + gtkscrollbar.h \ + gtkscrolledwindow.h \ + gtksearchbar.h \ + gtksearchentry.h \ + gtkselection.h \ + gtkseparator.h \ + gtkseparatormenuitem.h \ + gtkseparatortoolitem.h \ + gtksettings.h \ + gtkshortcutlabel.h \ + gtkshortcutsgroup.h \ + gtkshortcutssection.h \ + gtkshortcutsshortcut.h \ + gtkshortcutswindow.h \ + gtkshow.h \ + gtkstacksidebar.h \ + gtksizegroup.h \ + gtksizerequest.h \ + gtksocket.h \ + gtkspinbutton.h \ + gtkspinner.h \ + gtkstack.h \ + gtkstackswitcher.h \ + gtkstatusbar.h \ + gtkstylecontext.h \ + gtkstyleprovider.h \ + gtkswitch.h \ + gtktestutils.h \ + gtktextattributes.h \ + gtktextbuffer.h \ + gtktextbufferrichtext.h \ + gtktextchild.h \ + gtktextdisplay.h \ + gtktextiter.h \ + gtktextmark.h \ + gtktexttag.h \ + gtktexttagtable.h \ + gtktextview.h \ + gtktogglebutton.h \ + gtktoggletoolbutton.h \ + gtktoolbar.h \ + gtktoolbutton.h \ + gtktoolitem.h \ + gtktoolitemgroup.h \ + gtktoolpalette.h \ + gtktoolshell.h \ + gtktooltip.h \ + gtktreednd.h \ + gtktreemodel.h \ + gtktreemodelfilter.h \ + gtktreemodelsort.h \ + gtktreeselection.h \ + gtktreesortable.h \ + gtktreestore.h \ + gtktreeview.h \ + gtktreeviewcolumn.h \ + gtktypes.h \ + gtkviewport.h \ + gtkvolumebutton.h \ + gtkwidget.h \ + gtkwidgetpath.h \ + gtkwindow.h \ + gtkwindowgroup.h + +GTK_PRIVATE_TYPE_HDRS = \ + gtkcsstypesprivate.h \ + gtktexthandleprivate.h diff --git a/win32/Makefile.am b/win32/Makefile.am index e5f9a3ff73..0e70d0d665 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -42,7 +42,7 @@ EXTRA_DIST += \ create-lists.bat \ create-lists-msvc.mak \ detectenv-msvc.mak \ - gen-gdkversionmacros-h.py \ + gen-version-items.py \ generate-msvc.mak \ gtk-introspection-msvc.mak \ introspection-msvc.mak \ diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection index e393cecd51..e472ac795e 100644 --- a/win32/Makefile.msvc-introspection +++ b/win32/Makefile.msvc-introspection @@ -93,7 +93,7 @@ $(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 '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect + 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 @@ -110,7 +110,7 @@ $(top_builddir)/win32/$(1).msvc.introspect: Makefile 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 \'>>$(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 diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in index b623a99491..e5ef631cd5 100644 --- a/win32/config-msvc.mak.in +++ b/win32/config-msvc.mak.in @@ -52,6 +52,7 @@ demo_sources = $(demo_sources) $(font_features_demo) !endif # Please do not change anything beneath this line unless maintaining the NMake Makefiles +GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ GTK_VERSION = @GTK_VERSION@ GDK_PREPROCESSOR_FLAGS = \ @@ -62,9 +63,13 @@ GDK_PREPROCESSOR_FLAGS = \ /I..\gdk\win32 GTK_PREPROCESSOR_FLAGS = \ + /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk \ /I..\gtk \ + /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk \ /I..\gdk \ /I..\gdk\win32 \ + /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3 \ + /I.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3 \ /I.. \ /I$(PREFIX)\include\gdk-pixbuf-2.0 \ /I$(PREFIX)\include\pango-1.0 \ diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index b1bf65d2c4..d19e3a4d59 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -33,6 +33,23 @@ NULL= +# For GDK enumeration sources +!include ..\gdk\gdk-pub-headers.mak + +!if [call create-lists.bat header gdk_headers.mak GDK_PUBLIC_HEADERS] +!endif + +!if [for %f in ($(gdk_public_h_sources) $(gdk_deprecated_h_sources)) do @call create-lists.bat file gdk_headers.mak ../gdk/%f] +!endif + +!if [call create-lists.bat footer gdk_headers.mak] +!endif + +!include gdk_headers.mak + +!if [del /f /q gdk_headers.mak] +!endif + # For GDK resources !if [call create-lists.bat header resources_sources.mak GDK_RESOURCES] @@ -47,6 +64,39 @@ NULL= !if [call create-lists.bat header resources_sources.mak GTK_RESOURCES] !endif +# For GTK enumeration sources +!include ..\gtk\gtk-mkenums-headers.mak +!include ..\gtk\a11y\Makefile.inc +!include ..\gtk\deprecated\Makefile.inc + +!if [call create-lists.bat header gtk_headers.mak GTK_PUBLIC_ENUM_HEADERS] +!endif + +!if [for %f in ($(GTK_PUB_HDRS:.h=)) do @call create-lists.bat file gtk_headers.mak ../gtk/%f.h] +!endif + +!if [for %f in ($(a11y_h_sources) $(gtk_deprecated_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_PRIVATE_ENUM_HEADERS] +!endif + +!if [for %f in ($(GTK_PRIVATE_TYPE_HDRS)) 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] +!endif + +# 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] !endif @@ -77,6 +127,8 @@ NULL= !if [call create-lists.bat footer resources_sources.mak] !endif +# For gtk demo program resources + !if [call create-lists.bat header resources_sources.mak GTK_DEMO_RESOURCES] !endif diff --git a/win32/gen-gdkversionmacros-h.py b/win32/gen-gdkversionmacros-h.py deleted file mode 100644 index 89d2a359d5..0000000000 --- a/win32/gen-gdkversionmacros-h.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 - -# Generate gdk/gdkversionmacros.h - -# Author: Fan, Chun-wei -# Date: July 25, 2019 - -import os -import sys -import argparse - -from replace import replace_multi, replace - -def main(argv): - srcdir = os.path.dirname(__file__) - top_srcdir = os.path.join(srcdir, os.pardir) - parser = argparse.ArgumentParser(description='Generate gdkversionmacros.h') - parser.add_argument('--version', help='Version of the package', - required=True) - args = parser.parse_args() - gdk_sourcedir = os.path.join(top_srcdir, 'gdk') - version_parts = args.version.split('.') - - gdkversionmacro_replace_items = {'@GTK_MAJOR_VERSION@': version_parts[0], - '@GTK_MINOR_VERSION@': version_parts[1], - '@GTK_MICRO_VERSION@': version_parts[2]} - - replace_multi(os.path.join(gdk_sourcedir, 'gdkversionmacros.h.in'), - os.path.join(gdk_sourcedir, 'gdkversionmacros.h'), - gdkversionmacro_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/gen-version-items.py b/win32/gen-version-items.py new file mode 100644 index 0000000000..a2f450cfe1 --- /dev/null +++ b/win32/gen-version-items.py @@ -0,0 +1,46 @@ +#!/usr/bin/python3 + +# Generate various items with version info + +# Author: Fan, Chun-wei +# Date: July 25, 2019 + +import os +import sys +import argparse + +from replace import replace_multi, replace + +def main(argv): + srcdir = os.path.dirname(__file__) + top_srcdir = os.path.join(srcdir, os.pardir) + parser = argparse.ArgumentParser(description='Generate various items with version info') + parser.add_argument('--version', help='Version of the package', + required=True) + parser.add_argument('--interface-age', help='Interface age of the package', + required=True) + parser.add_argument('--source', help='Source file template to process', + required=True) + parser.add_argument('--output', '-o', help='Output generated file location', + required=True) + args = parser.parse_args() + gdk_sourcedir = os.path.join(top_srcdir, 'gdk') + version_parts = args.version.split('.') + # (100 * gtk_minor_version + gtk_micro_version - gtk_interface_age) + binary_age = (int(version_parts[1]) * 100) + int(version_parts[2]) + lt_current = (int(version_parts[1]) * 100) + int(version_parts[2]) - int(args.interface_age) + lt_age = binary_age - int(args.interface_age) + + version_info_replace_items = {'@GTK_MAJOR_VERSION@': version_parts[0], + '@GTK_MINOR_VERSION@': version_parts[1], + '@GTK_MICRO_VERSION@': version_parts[2], + '@GTK_API_VERSION@': '3.0', + '@GTK_VERSION@': args.version, + '@GTK_BINARY_AGE@': str(binary_age), + '@GTK_INTERFACE_AGE@': args.interface_age, + '@LT_CURRENT_MINUS_AGE@': str(lt_current - lt_age)} + + replace_multi(args.source, args.output, version_info_replace_items) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index dd8691d127..99919f84d8 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -25,36 +25,58 @@ GDK_CONFIG_TEMPLATE = ..\gdk\gdkconfig.h.win32 !endif GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers -GDK_RESOURCES_ARGS = ..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\gdk --c-name _gdk --manual-register +GDK_RESOURCES_ARGS = --target=$@ --sourcedir=..\gdk --c-name _gdk --manual-register GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers -GTK_RESOURCES_ARGS = ..\gtk\gtk.gresource.xml --target=$@ --sourcedir=..\gtk --c-name _gtk --manual-register +GTK_RESOURCES_ARGS = --target=$@ --sourcedir=..\gtk --c-name _gtk --manual-register -all: \ - ..\config.h \ - ..\gdk\gdkconfig.h \ - ..\gdk\gdkversionmacros.h \ - ..\gdk\gdkmarshalers.h \ - ..\gdk\gdkmarshalers.c \ - ..\gdk\gdkresources.h \ - ..\gdk\gdkresources.c \ - ..\gtk\gtk-win32.rc \ - ..\gtk\libgtk3.manifest \ - ..\gtk\gtkdbusgenerated.h \ - ..\gtk\gtkdbusgenerated.c \ - ..\gtk\gtktypefuncs.inc \ - ..\gtk\gtk.gresource.xml \ - ..\gtk\gtkmarshalers.h \ - ..\gtk\gtkmarshalers.c \ - ..\gtk\gtkresources.h \ - ..\gtk\gtkresources.c \ +GDK_GENERATED_SOURCES = \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h + +GTK_TYPEBUILTIN_SOURCES = \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c + +GTK_GENERATED_SOURCES = \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c \ + $(GTK_TYPEBUILTIN_SOURCES) \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h \ + .\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 + +generate-base-sources: \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ + $(GDK_GENERATED_SOURCES) \ + $(GTK_GENERATED_SOURCES) \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml \ ..\demos\gtk-demo\demos.h \ ..\demos\gtk-demo\demo_resources.c \ ..\demos\icon-browser\resources.c # Copy the pre-defined config.h.win32 and demos.h.win32 -..\config.h: ..\config.h.win32 +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h: ..\config.h.win32 ..\demos\gtk-demo\demos.h: ..\demos\gtk-demo\demos.h.win32 -..\gtk\gtk-win32.rc: ..\gtk\gtk-win32.rc.body + +# Generate the versioned headers and resource scripts (*.rc) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h: ..\gtk\gtkversion.h.in +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc: ..\gdk\win32\rc\gdk.rc.in +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc: ..\gtk\gtk-win32.rc.body.in ..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE) @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build @@ -62,31 +84,69 @@ all: \ @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build @copy $** $@ -..\gdk\gdkconfig.h: ..\gdk-$(CFG)-$(GDK_CONFIG)-build +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h: ..\gdk-$(CFG)-$(GDK_CONFIG)-build -..\config.h \ -..\gdk\gdkconfig.h \ -..\gtk\gtk-win32.rc \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h \ ..\demos\gtk-demo\demos.h: @echo Copying $@... + @if not exist $(@D)\ md $(@D) @copy $** $@ -..\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in - @echo Generating $@... - @$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c: ..\gdk\gdkenumtypes.c.template $(GDK_PUBLIC_HEADERS) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h: ..\gdk\gdkenumtypes.h.template $(GDK_PUBLIC_HEADERS) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c: ..\gtk\gtktypebuiltins.c.template $(GTK_PUBLIC_ENUM_HEADERS) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h: ..\gtk\gtktypebuiltins.h.template $(GTK_PUBLIC_ENUM_HEADERS) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c: ..\gtk\gtkprivatetypebuiltins.c.template $(GTK_PRIVATE_ENUM_HEADERS) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h: ..\gtk\gtkprivatetypebuiltins.h.template $(GTK_PRIVATE_ENUM_HEADERS) -..\gdk\gdkmarshalers.h: ..\gdk\gdkmarshalers.list +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h: @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @cd ..\gdk + @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(gdk_public_h_sources) $(gdk_deprecated_h_sources) > ..\win32\$@ + @cd ..\win32 + +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c: + @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @cd ..\gtk + @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(GTK_PUB_HDRS) $(a11y_h_sources) $(gtk_deprecated_h_sources) > ..\win32\$@ + @cd ..\win32 + +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h: + @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @cd ..\gtk + @$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(GTK_PRIVATE_TYPE_HDRS) > ..\win32\$@ + @cd ..\win32 + +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc \ +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc: + @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @$(PYTHON) gen-version-items.py --version=$(GTK_VERSION) --interface-age=$(GTK_INTERFACE_AGE) --source=$** --output=$@ + +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h: ..\gdk\gdkmarshalers.list + @echo Generating $@... + @if not exist $(@D)\ md $(@D) @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp @move $@.tmp $@ -..\gdk\gdkmarshalers.c: ..\gdk\gdkmarshalers.list +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c: ..\gdk\gdkmarshalers.list @echo Generating $@... + @if not exist $(@D)\ md $(@D) @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp @move $@.tmp $@ -..\gdk\gdk.gresource.xml: $(GDK_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml: $(GDK_RESOURCES) @echo Generating $@... + @if not exist $(@D)\ md $(@D) @echo ^ >$@ @echo ^ >> $@ @echo ^ >> $@ @@ -94,44 +154,51 @@ all: \ @echo ^ >> $@ @echo ^ >> $@ -..\gdk\gdkresources.h: ..\gdk\gdk.gresource.xml +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml @echo Generating $@... @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header + @start /min $(GLIB_COMPILE_RESOURCES) $** $(GDK_RESOURCES_ARGS) --generate-header -..\gdk\gdkresources.c: ..\gdk\gdk.gresource.xml $(GDK_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml @echo Generating $@... @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source + @start /min $(GLIB_COMPILE_RESOURCES) $** $(GDK_RESOURCES_ARGS) --generate-source -..\gtk\libgtk3.manifest: ..\gtk\libgtk3.manifest.in +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest: ..\gtk\libgtk3.manifest.in @echo Generating $@... + @if not exist $(@D)\ md $(@D) @$(PYTHON) replace.py \ --action=replace-var \ --input=$** --output=$@ \ --var=EXE_MANIFEST_ARCHITECTURE \ --outstring=* -..\gtk\gtkdbusgenerated.h ..\gtk\gtkdbusgenerated.c: ..\gtk\gtkdbusinterfaces.xml +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h: ..\gtk\gtkdbusinterfaces.xml @echo Generating GTK DBus sources... + @if not exist $(@D)\ md $(@D) @$(PYTHON) $(GDBUS_CODEGEN) \ --interface-prefix org.Gtk. --c-namespace _Gtk \ --generate-c-code gtkdbusgenerated $** \ --output-directory $(@D) -..\gtk\gtktypefuncs.inc: ..\gtk\gentypefuncs.py +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h + +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc: ..\gtk\gentypefuncs.py @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @if not exist $(@D)\gtktypebuiltins.h $(MAKE) /f generate-msvc.mak CFG=$(CFG) $(@D)\gtktypebuiltins.h + @if not exist $(@D)\gtkversion.h $(MAKE) /f generate-msvc.mak CFG=$(CFG) $(@D)\gtkversion.h @echo #undef GTK_COMPILATION > $(@R).preproc.c @echo #include "gtkx.h" >> $(@R).preproc.c @cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c @$(PYTHON) $** $@ $(@R).combined.c @del $(@R).preproc.c $(@R).combined.c -..\gtk\gtk.gresource.xml: $(GTK_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml: $(GTK_RESOURCES) @echo Generating $@... @echo ^> $@ @echo ^>> $@ @@ -161,26 +228,26 @@ all: \ @echo ^>> $@ @echo ^>> $@ -..\gtk\gtkresources.h: ..\gtk\gtk.gresource.xml +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml @echo Generating $@... @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header + @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) $** --generate-header -..\gtk\gtkresources.c: ..\gtk\gtk.gresource.xml $(GTK_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c: .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml @echo Generating $@... @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source + @start /min $(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) $** --generate-source -..\gtk\gtkmarshalers.h: ..\gtk\gtkmarshalers.list +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h: ..\gtk\gtkmarshalers.list @echo Generating $@... @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp @move $@.tmp $@ -..\gtk\gtkmarshalers.c: ..\gtk\gtkmarshalers.list +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c: ..\gtk\gtkmarshalers.list @echo Generating $@... @echo #undef G_ENABLE_DEBUG> $@.tmp @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp @@ -200,30 +267,54 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) @cd ..\demos\gtk-demo @$(PYTHON) geninclude.py demos.h.win32 $(demo_sources) +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 @-del /f /q ..\demos\gtk-demo\demo_resources.c @-del /f /q ..\demos\gtk-demo\demos.h - @-del /f /q ..\gtk\gtkresources.c - @-del /f /q ..\gtk\gtkresources.h - @-del /f /q ..\gtk\gtkmarshalers.c - @-del /f /q ..\gtk\gtkmarshalers.h - @-del /f /q ..\gtk\gtk.gresource.xml - @-del /f /q ..\gtk\gtktypefuncs.inc - @-del /f /q ..\gtk\gtkdbusgenerated.c - @-del /f /q ..\gtk\gtkdbusgenerated.h - @-del /f /q ..\gtk\libgtk3.manifest - @-del /f /q ..\gtk\gtk-win32.rc - @-del /f /q ..\gdk\gdkresources.c - @-del /f /q ..\gdk\gdkresources.h - @-del /f /q ..\gdk\gdk.gresource.xml - @-del /f /q ..\gdk\gdkmarshalers.c - @-del /f /q ..\gdk\gdkmarshalers.h - @-del /f /q ..\gdk\gdkversionmacros.h - @-del /f /q ..\gdk\gdkconfig.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkmarshalers.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypefuncs.inc + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkdbusgenerated.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc + @-rd .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkenumtypes.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkresources.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.gresource.xml + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkmarshalers.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdk.rc + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h @if exist ..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_CONFIG)-build @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build - @-del /f /q ..\config.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h + @-rd .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk diff --git a/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak index d2af90b5cb..07d0e2c762 100644 --- a/win32/gtk-introspection-msvc.mak +++ b/win32/gtk-introspection-msvc.mak @@ -1,6 +1,7 @@ # NMake Makefile to build Introspection Files for GTK+ !include detectenv-msvc.mak +!include generate-msvc.mak APIVERSION = 3.0 @@ -28,7 +29,7 @@ AT_PLAT=aarch64 AT_PLAT=i686 !endif -all: setgirbuildenv $(built_install_girs) $(built_install_typelibs) +introspect: setgirbuildenv $(built_install_girs) $(built_install_typelibs) setgirbuildenv: @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection @@ -38,15 +39,18 @@ setgirbuildenv: !include introspection.body.mak -install-introspection: all +install-introspection: introspect @-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)" @-copy /b vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib "$(G_IR_TYPELIBDIR)" !else -all: +introspect: @-echo $(ERROR_MSG) !endif -clean: +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)\bin\*.typelib @-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 1117c03e07..ef627102d4 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -64,7 +64,6 @@ EXTRA_DIST += \ gtk3-introspect.vcxproj \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.propsin \ gtk3-version-paths.props.in \ diff --git a/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin index ea2cc36e53..5e4f3e5415 100644 --- a/win32/vs10/broadwayd.vcxprojin +++ b/win32/vs10/broadwayd.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) true $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) true $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin index ff09df22d2..b28b1df7e8 100644 --- a/win32/vs10/gailutil-3.vcxprojin +++ b/win32/vs10/gailutil-3.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -100,7 +100,7 @@ MaxSpeed true - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -125,7 +125,7 @@ Disabled - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -148,7 +148,7 @@ - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index ef8ba4db17..fd5e79eb17 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -133,7 +133,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,6 +143,9 @@ Level3 EditAndContinue + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -156,7 +159,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -166,6 +169,9 @@ Level3 EditAndContinue + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -178,7 +184,7 @@ - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -186,6 +192,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -200,7 +209,7 @@ - ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -208,6 +217,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -223,7 +235,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -233,6 +245,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -246,7 +261,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -256,6 +271,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -268,7 +286,7 @@ - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -276,6 +294,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -290,7 +311,7 @@ - ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -298,6 +319,9 @@ Level3 ProgramDatabase + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll @@ -311,10 +335,13 @@ - + #include "gdk-3.vs10.sourcefiles" + + + diff --git a/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin index d1b4817b82..9827954fac 100644 --- a/win32/vs10/gdk3-broadway.vcxprojin +++ b/win32/vs10/gdk3-broadway.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin index 8ad851d1c4..37e5586c01 100644 --- a/win32/vs10/gdk3-win32.vcxprojin +++ b/win32/vs10/gdk3-win32.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk-3.vcxproj.filtersin b/win32/vs10/gtk-3.vcxproj.filtersin index 8004f7e618..e198ed17d6 100644 --- a/win32/vs10/gtk-3.vcxproj.filtersin +++ b/win32/vs10/gtk-3.vcxproj.filtersin @@ -15,7 +15,7 @@ - Resource Files + Resource Files #include "gtk-3.vs10.sourcefiles.filters" @@ -36,6 +36,6 @@ Source Files - Resource Files + Resource Files diff --git a/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin index d617cb2296..188340308c 100644 --- a/win32/vs10/gtk-3.vcxprojin +++ b/win32/vs10/gtk-3.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -75,7 +75,7 @@ Disabled - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -97,7 +97,7 @@ - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -142,7 +142,7 @@ - ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -163,10 +163,15 @@ - + #include "gtk-3.vs10.sourcefiles" + + + + + @@ -184,7 +189,7 @@ - + diff --git a/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj index a60b5e37eb..d88a9e65d7 100644 --- a/win32/vs10/gtk-builder-tool.vcxproj +++ b/win32/vs10/gtk-builder-tool.vcxproj @@ -75,7 +75,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj index 64d572035e..da630f7f51 100644 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\gdk;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - ..\..\gdk;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\gdk;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - ..\..\gdk;%(AdditionalIncludeDirectories) + $(GdkBaseIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj index 5bd517bccb..24717aa73f 100644 --- a/win32/vs10/gtk-query-settings.vcxproj +++ b/win32/vs10/gtk-query-settings.vcxproj @@ -75,7 +75,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj index 103671e99f..b94c809e0c 100644 --- a/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/win32/vs10/gtk-update-icon-cache.vcxproj @@ -75,7 +75,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - %(AdditionalIncludeDirectories) + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk3-build-defines.props b/win32/vs10/gtk3-build-defines.props index 4fddda3189..c8c511b9bd 100644 --- a/win32/vs10/gtk3-build-defines.props +++ b/win32/vs10/gtk3-build-defines.props @@ -8,6 +8,13 @@ /dummy GTK_PREFIX=\"$(GtkDummyPrefix)\" GDK_COMPILATION;G_LOG_DOMAIN="Gdk" + .\$(Configuration)\$(Platform)\obj\gdk-3 + .\Release\$(Platform)\obj\gdk-3 + .\Debug\$(Platform)\obj\gdk-3 + .\$(Configuration)\$(Platform)\obj\gtk-3 + $(GtkGenSrcDir);$(GdkGenSrcDir);..\.. + $(GdkGenSrcDir)\gdk;..\..\gdk;$(BaseConfigIncludes) + $(GtkGenSrcDir)\gtk;..\..\gtk;$(GdkBaseIncludes) INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr i686 x86_64 @@ -22,6 +29,9 @@ set VCInstallDir=$(VCInstallDir) nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) $(BinDir)\Gtk-3.0.gir;$(BinDir)\Gtk-3.0.typelib + cd .. +set VCInstallDir=$(VCInstallDir) +nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) <_PropertySheetDisplayName>gtk3builddefinesprops @@ -30,7 +40,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall - ..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\harfbuzz;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + $(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\harfbuzz;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;G_ENABLE_DEBUG;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) true @@ -62,6 +72,21 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall $(GdkDefines) + + $(GdkGdkGenSrcDir) + + + $(GtkGdkGenSrcDir) + + + $(BaseConfigIncludes) + + + $(GdkBaseIncludes) + + + $(GtkBaseIncludes) + $(GtkIncludedImmodulesDefines) @@ -89,5 +114,8 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall $(GtkIntrospectBuiltFiles) + + $(GenerateRequiredSourcesBase) + diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin index 6ff02c81bc..9167c4c2c4 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxprojin @@ -75,6 +75,7 @@ Disabled + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -93,6 +94,7 @@ MaxSpeed + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -116,6 +118,7 @@ Disabled + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -137,6 +140,7 @@ MaxSpeed + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin index 7088d43f9e..76f22e512a 100644 --- a/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -97,7 +97,7 @@ - ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL @@ -121,7 +121,7 @@ Disabled - ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ - ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkBaseIncludes);%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk3-gen-srcs.props b/win32/vs10/gtk3-gen-srcs.props deleted file mode 100644 index 64162846c5..0000000000 --- a/win32/vs10/gtk3-gen-srcs.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) - ..\config.h;..\gdk\gdkconfig.h;..\gdk\gdkversionmacros.h;..\gdk\gdkmarshalers.h;..\gdk\gdkmarshalers.c;..\gdk\gdkresources.h;..\gdk\gdkresources.c - ..\gtk\gtk-win32.rc;..\gtk\libgtk3.manifest;..\gtk\gtkdbusgenerated.h;..\gtk\gtkdbusgenerated.c - ..\demos\gtk-demo\demos.h - - - <_PropertySheetDisplayName>gtk3gensrcsprops - - - - $(GenerateRequiredSourcesBase) - - - $(GeneratedGdkSources) - - - $(GeneratedGtkSources) - - - $(GeneratedDemoSources) - - - diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin index df11ee027c..70f76d8ccf 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ MaxSpeed - ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -118,7 +118,7 @@ Disabled - ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -140,7 +140,7 @@ MaxSpeed - ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;$(BaseConfigIncludes);%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs10/gtk3-install.propsin b/win32/vs10/gtk3-install.propsin index 4badaff1c0..7e6cc466d3 100644 --- a/win32/vs10/gtk3-install.propsin +++ b/win32/vs10/gtk3-install.propsin @@ -121,12 +121,35 @@ 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" -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated #include "gtk-3.vs10.headers" mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util diff --git a/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj index 6c191dde9e..cba81df3c2 100644 --- a/win32/vs10/gtk3-introspect.vcxproj +++ b/win32/vs10/gtk3-introspect.vcxproj @@ -68,27 +68,27 @@ - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean $(GtkIntrospectBuiltFiles) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean $(GtkIntrospectBuiltFiles) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean $(GtkIntrospectBuiltFiles) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all - $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean introspect + $(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) introspect-clean $(GtkIntrospectBuiltFiles) diff --git a/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj index 3f1e73bc6a..b73d9802cc 100644 --- a/win32/vs10/gtk3-prebuild.vcxproj +++ b/win32/vs10/gtk3-prebuild.vcxproj @@ -89,46 +89,46 @@ - + - + - + - + - + - + - + - + - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) - $(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all - $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all - $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all + $(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 diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index 454d273267..becafd26c1 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index ac45c949a5..1dd4ba7674 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 2db9336ea0..318c87b7a9 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index 624d56ac48..619128e42c 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST_COPIED = \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index 89f2b2d4d7..64ca7a6c8c 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index 7d65a4f8e5..35d581e313 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST += \ gdk3-broadway.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ - gtk3-gen-srcs.props \ gtk3-ignore-broadway.props \ gtk3-install.props \ gtk3-version-paths.props diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index f0dd87b076..eded327a89 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -41,7 +41,6 @@ EXTRA_DIST += \ gdk3-broadway.vcprojin \ gtk3-build-defines.vsprops \ gtk3-copy-gdk-broadway.vsprops \ - gtk3-gen-srcs.vsprops \ gtk3-ignore-broadway.vsprops \ gtk3-install.vspropsin \ gtk3-version-paths.vsprops.in \ diff --git a/win32/vs9/broadwayd.vcprojin b/win32/vs9/broadwayd.vcprojin index ebe2658c26..3d795b98f1 100644 --- a/win32/vs9/broadwayd.vcprojin +++ b/win32/vs9/broadwayd.vcprojin @@ -31,7 +31,7 @@ + + + + + + + + - + + + + + + + + + + + + #include "gdk-3.sourcefiles" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/vs9/gdk3-broadway.vcprojin b/win32/vs9/gdk3-broadway.vcprojin index d66af2f26c..c251350c1d 100644 --- a/win32/vs9/gdk3-broadway.vcprojin +++ b/win32/vs9/gdk3-broadway.vcprojin @@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@ @@ -95,7 +95,7 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/vs9/gtk-builder-tool.vcproj b/win32/vs9/gtk-builder-tool.vcproj index 4de2b7dc69..77d7ee0a97 100644 --- a/win32/vs9/gtk-builder-tool.vcproj +++ b/win32/vs9/gtk-builder-tool.vcproj @@ -31,6 +31,7 @@ + + + + + + + diff --git a/win32/vs9/gtk3-demo-application.vcprojin b/win32/vs9/gtk3-demo-application.vcprojin index 2d8a85db36..41a2d3367b 100644 --- a/win32/vs9/gtk3-demo-application.vcprojin +++ b/win32/vs9/gtk3-demo-application.vcprojin @@ -31,6 +31,7 @@ - - - - - - diff --git a/win32/vs9/gtk3-icon-browser.vcprojin b/win32/vs9/gtk3-icon-browser.vcprojin index 42bbd67fae..971235aff8 100644 --- a/win32/vs9/gtk3-icon-browser.vcprojin +++ b/win32/vs9/gtk3-icon-browser.vcprojin @@ -31,7 +31,7 @@ @@ -38,9 +38,9 @@ > @@ -53,9 +53,9 @@ > @@ -66,9 +66,9 @@ > diff --git a/win32/vs9/gtk3-prebuild.vcproj b/win32/vs9/gtk3-prebuild.vcproj index 7c328f7274..c211ecea3a 100644 --- a/win32/vs9/gtk3-prebuild.vcproj +++ b/win32/vs9/gtk3-prebuild.vcproj @@ -22,125 +22,117 @@