diff --git a/INSTALL b/INSTALL
index f059a5449e..f17402c15e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,8 @@ Prerequisites
GTK+ requires the following packages:
- The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
- the same location as GTK+. GTK+ 3.24.10 requires at least
- GLib 2.53.4, Pango 1.41.0,
+ the same location as GTK+. GTK+ 3.24.11 requires at least
+ GLib 2.57.2, Pango 1.41.0,
GdkPixbuf 2.30.0, ATK 2.15.1
and cairo 1.14.0.
@@ -22,8 +22,8 @@ GTK+ requires the following packages:
Simple install procedure
========================
- % tar xf gtk+-3.24.10.tar.xz # unpack the sources
- % cd gtk+-3.24.10 # change to the toplevel directory
+ % tar xf gtk+-3.24.11.tar.xz # unpack the sources
+ % cd gtk+-3.24.11 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GTK+
[ Become root if necessary ]
diff --git a/Makefile.in b/Makefile.in
index 5a5dcbd9c7..53c43d7687 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -215,8 +215,8 @@ am__DIST_COMMON = $(srcdir)/INSTALL.in $(srcdir)/Makefile.in \
$(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL NEWS README build-aux/compile \
build-aux/config.guess build-aux/config.rpath \
- build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
- build-aux/missing
+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+ build-aux/ltmain.sh build-aux/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
diff --git a/NEWS b/NEWS
index e810eb5a1e..fe02c9f795 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,52 @@
+Overview of Changes in GTK+ 3.24.11
+===================================
+
+* Adwaita:
+ - Add drop shadow to icons
+ - Small color fixes
+ - Make title buttons round
+
+* OS X: Fix the monitors-changed signal
+
+* Win32:
+ - Build fixes
+ - Support choices in the native file chooser
+ - Fix icon cache freshness checks on 64bit
+
+* Wayland:
+ - Support xdg-output v3
+ - Fix clipboard ownership handling
+
+* X11: Improve monitor metadata
+
+* Build: Require GLib 2.57.2
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ British English
+ Catalan
+ Croatian
+ French
+ Friulian
+ Galician
+ German
+ Greek
+ Hungarian
+ Indonesian
+ Japanese
+ Korean
+ Latvian
+ Lithuanian
+ Polish
+ Punjabi
+ Romanian
+ Serbian
+ Slovenian
+ Spanish
+ Swedish
+
+
Overview of Changes in GTK+ 3.24.10
===================================
diff --git a/README b/README
index e70fe87bd7..78319b6f8c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
General Information
===================
-This is GTK+ version 3.24.10. GTK+ is a multi-platform toolkit for
+This is GTK+ version 3.24.11. GTK+ is a multi-platform toolkit for
creating graphical user interfaces. Offering a complete set of widgets,
GTK+ is suitable for projects ranging from small one-off projects to
complete application suites.
diff --git a/build-aux/compile b/build-aux/compile
index b89c278e0c..99e50524b3 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2018-03-07.03; # UTC
diff --git a/build-aux/config.guess b/build-aux/config.guess
index b5d7a0f39b..b33c9e890e 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
diff --git a/build-aux/config.sub b/build-aux/config.sub
index be4dc6e59f..b51fb8cdb6 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 4e0ae31b8a..65cbf7093a 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2018-03-07.03; # UTC
diff --git a/build-aux/install-sh b/build-aux/install-sh
index defb86aef8..8175c640fe 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2018-03-11.20; # UTC
diff --git a/build-aux/missing b/build-aux/missing
index ab658ed5db..625aeb1189 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2018-03-07.03; # UTC
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index 81611776e2..a93ba432f1 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -21,17 +21,17 @@ if MSVC_NO_TOOLSET_SET
MSVC_TOOLSET = $(MSVC_VER)0
endif
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -45,7 +45,7 @@ endif
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/Makefile.msvc-introspection b/build/Makefile.msvc-introspection
index 85c01b4dd9..afbf7c9cad 100644
--- a/build/Makefile.msvc-introspection
+++ b/build/Makefile.msvc-introspection
@@ -80,6 +80,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
$(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
+ rm -f $(top_builddir)/build/win32/$(_gir_name)_list
for F in $(_gir_files_msvc); do \
case $$$$F in \
*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
diff --git a/build/win32/Gtk_3_0_gir_list b/build/win32/Gtk_3_0_gir_list
index 1a3db10a5d..e145f24d14 100644
--- a/build/win32/Gtk_3_0_gir_list
+++ b/build/win32/Gtk_3_0_gir_list
@@ -238,6 +238,7 @@
..\..\gtk\a11y\gtkflowboxaccessible.h
..\..\gtk\a11y\gtkflowboxchildaccessible.h
..\..\gtk\a11y\gtkframeaccessible.h
+..\..\gtk\a11y\gtkheaderbaraccessible.h
..\..\gtk\a11y\gtkiconviewaccessible.h
..\..\gtk\a11y\gtkimageaccessible.h
..\..\gtk\a11y\gtkimagecellaccessible.h
@@ -333,6 +334,7 @@
..\..\gtk\a11y\gtkflowboxaccessible.c
..\..\gtk\a11y\gtkflowboxchildaccessible.c
..\..\gtk\a11y\gtkframeaccessible.c
+..\..\gtk\a11y\gtkheaderbaraccessible.c
..\..\gtk\a11y\gtkiconviewaccessible.c
..\..\gtk\a11y\gtkimageaccessible.c
..\..\gtk\a11y\gtkimagecellaccessible.c
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 032f0f1cfd..c83b78bf45 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -36,7 +36,13 @@ SUBDIRS = \
vs16
EXTRA_DIST += \
+ config-msvc.mak \
+ config-msvc.mak.in \
+ create-lists.bat \
+ create-lists-msvc.mak \
detectenv-msvc.mak \
+ gen-gdkversionmacros-h.py \
+ generate-msvc.mak \
gtk-introspection-msvc.mak \
introspection-msvc.mak \
replace.py \
diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index e121187d3a..ba7eae03e4 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -107,7 +107,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = config-msvc.mak
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -164,7 +164,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-msvc.mak.in \
+ $(top_srcdir)/Makefile.decl
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -465,9 +466,11 @@ GTESTER = gtester -k # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
-EXTRA_DIST = detectenv-msvc.mak gtk-introspection-msvc.mak \
- introspection-msvc.mak replace.py pc_base.py gtkpc.py \
- README_EGL_MSVC.txt $(GENERATED_ITEMS)
+EXTRA_DIST = config-msvc.mak config-msvc.mak.in create-lists.bat \
+ create-lists-msvc.mak detectenv-msvc.mak \
+ gen-gdkversionmacros-h.py generate-msvc.mak \
+ gtk-introspection-msvc.mak introspection-msvc.mak replace.py \
+ pc_base.py gtkpc.py README_EGL_MSVC.txt $(GENERATED_ITEMS)
TEST_PROGS =
### testing rules
@@ -548,6 +551,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+config-msvc.mak: $(top_builddir)/config.status $(srcdir)/config-msvc.mak.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-rm -f *.lo
diff --git a/build/win32/config-msvc.mak b/build/win32/config-msvc.mak
new file mode 100644
index 0000000000..6f1815a67a
--- /dev/null
+++ b/build/win32/config-msvc.mak
@@ -0,0 +1,95 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+!include detectenv-msvc.mak
+
+# Default prefix if not defined
+!ifndef PREFIX
+PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
+!endif
+
+# Configurable paths to the various interpreters we need
+!ifndef PERL
+PERL = perl
+!endif
+
+!ifndef PYTHON
+PYTHON=python
+!endif
+
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
+# Configurable paths to the various scripts and tools that we are using
+!ifndef GLIB_MKENUMS
+GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums
+!endif
+
+!ifndef GLIB_GENMARSHAL
+GLIB_GENMARSHAL = $(PREFIX)\bin\glib-genmarshal
+!endif
+
+!ifndef GLIB_COMPILE_RESOURCES
+GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
+!endif
+
+!ifndef GDBUS_CODEGEN
+GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
+!endif
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+GTK_VERSION = 3.24.11
+
+GDK_PREPROCESSOR_FLAGS = \
+ /DG_LOG_USE_STRUCTURED=1 \
+ /DGDK_COMPILATION \
+ /I..\.. \
+ /I..\..\gdk \
+ /I..\..\gdk\win32
+
+GTK_PREPROCESSOR_FLAGS = \
+ /I..\..\gtk \
+ /I..\..\gdk \
+ /I..\..\gdk\win32 \
+ /I..\.. \
+ /I$(PREFIX)\include\gdk-pixbuf-2.0 \
+ /I$(PREFIX)\include\pango-1.0 \
+ /I$(PREFIX)\include\atk-1.0 \
+ /I$(PREFIX)\include\cairo \
+ /I$(PREFIX)\include\gio-win32-2.0 \
+ /I$(PREFIX)\include\glib-2.0 \
+ /I$(PREFIX)\lib\glib-2.0\include \
+ /I$(PREFIX)\include \
+ /DHAVE_CONFIG_H \
+ /DG_DISABLE_SINGLE_INCLUDES \
+ /DATK_DISABLE_SINGLE_INCLUDES \
+ /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ /DGTK_DISABLE_SINGLE_INCLUDES \
+ /D_USE_MATH_DEFINES \
+ /DGTK_COMPILATION \
+ /DG_LOG_DOMAIN=\"Gtk\" \
+ /DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
+ /DGTK_PRINT_BACKENDS=\"file\" \
+ /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ /DINCLUDE_IM_am_et \
+ /DINCLUDE_IM_cedilla \
+ /DINCLUDE_IM_cyrillic_translit \
+ /DINCLUDE_IM_ime \
+ /DINCLUDE_IM_inuktitut \
+ /DINCLUDE_IM_ipa \
+ /DINCLUDE_IM_multipress \
+ /DINCLUDE_IM_thai \
+ /DINCLUDE_IM_ti_er \
+ /DINCLUDE_IM_ti_et \
+ /DINCLUDE_IM_viqr \
+ /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\" \
+ /DGTK_DATADIR=\"$(PREFIX:\=/)/share\" \
+ /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\" \
+ /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\" \
+ /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\" \
+ /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\" \
+ /DGTK_VERSION=\"$(GTK_VERSION)\" \
+ /DGTK_BINARY_VERSION=\"3.0.0\" \
+ /DGDK_DISABLE_DEPRECATED \
+ /DISOLATION_AWARE_ENABLED
diff --git a/build/win32/config-msvc.mak.in b/build/win32/config-msvc.mak.in
new file mode 100644
index 0000000000..49c077deef
--- /dev/null
+++ b/build/win32/config-msvc.mak.in
@@ -0,0 +1,95 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+!include detectenv-msvc.mak
+
+# Default prefix if not defined
+!ifndef PREFIX
+PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
+!endif
+
+# Configurable paths to the various interpreters we need
+!ifndef PERL
+PERL = perl
+!endif
+
+!ifndef PYTHON
+PYTHON=python
+!endif
+
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
+# Configurable paths to the various scripts and tools that we are using
+!ifndef GLIB_MKENUMS
+GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums
+!endif
+
+!ifndef GLIB_GENMARSHAL
+GLIB_GENMARSHAL = $(PREFIX)\bin\glib-genmarshal
+!endif
+
+!ifndef GLIB_COMPILE_RESOURCES
+GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
+!endif
+
+!ifndef GDBUS_CODEGEN
+GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
+!endif
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+GTK_VERSION = @GTK_VERSION@
+
+GDK_PREPROCESSOR_FLAGS = \
+ /DG_LOG_USE_STRUCTURED=1 \
+ /DGDK_COMPILATION \
+ /I..\.. \
+ /I..\..\gdk \
+ /I..\..\gdk\win32
+
+GTK_PREPROCESSOR_FLAGS = \
+ /I..\..\gtk \
+ /I..\..\gdk \
+ /I..\..\gdk\win32 \
+ /I..\.. \
+ /I$(PREFIX)\include\gdk-pixbuf-2.0 \
+ /I$(PREFIX)\include\pango-1.0 \
+ /I$(PREFIX)\include\atk-1.0 \
+ /I$(PREFIX)\include\cairo \
+ /I$(PREFIX)\include\gio-win32-2.0 \
+ /I$(PREFIX)\include\glib-2.0 \
+ /I$(PREFIX)\lib\glib-2.0\include \
+ /I$(PREFIX)\include \
+ /DHAVE_CONFIG_H \
+ /DG_DISABLE_SINGLE_INCLUDES \
+ /DATK_DISABLE_SINGLE_INCLUDES \
+ /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ /DGTK_DISABLE_SINGLE_INCLUDES \
+ /D_USE_MATH_DEFINES \
+ /DGTK_COMPILATION \
+ /DG_LOG_DOMAIN=\"Gtk\" \
+ /DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
+ /DGTK_PRINT_BACKENDS=\"file\" \
+ /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ /DINCLUDE_IM_am_et \
+ /DINCLUDE_IM_cedilla \
+ /DINCLUDE_IM_cyrillic_translit \
+ /DINCLUDE_IM_ime \
+ /DINCLUDE_IM_inuktitut \
+ /DINCLUDE_IM_ipa \
+ /DINCLUDE_IM_multipress \
+ /DINCLUDE_IM_thai \
+ /DINCLUDE_IM_ti_er \
+ /DINCLUDE_IM_ti_et \
+ /DINCLUDE_IM_viqr \
+ /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\" \
+ /DGTK_DATADIR=\"$(PREFIX:\=/)/share\" \
+ /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\" \
+ /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\" \
+ /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\" \
+ /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\" \
+ /DGTK_VERSION=\"$(GTK_VERSION)\" \
+ /DGTK_BINARY_VERSION=\"3.0.0\" \
+ /DGDK_DISABLE_DEPRECATED \
+ /DISOLATION_AWARE_ENABLED
diff --git a/build/win32/create-lists-msvc.mak b/build/win32/create-lists-msvc.mak
new file mode 100644
index 0000000000..8e2467ed44
--- /dev/null
+++ b/build/win32/create-lists-msvc.mak
@@ -0,0 +1,101 @@
+# Convert the source listing to object (.obj) listing in
+# another NMake Makefile module, include it, and clean it up.
+# This is a "fact-of-life" regarding NMake Makefiles...
+# This file does not need to be changed unless one is maintaining the NMake Makefiles
+
+# For those wanting to add things here:
+# To add a list, do the following:
+# # $(description_of_list)
+# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)]
+# endif
+#
+# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]
+# endif
+#
+# if [call create-lists.bat footer $(makefile_snippet_file)]
+# endif
+# ... (repeat the if [call ...] lines in the above order if needed)
+# !include $(makefile_snippet_file)
+#
+# (add the following after checking the entries in $(makefile_snippet_file) is correct)
+# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added)
+#!if [del /f /q $(makefile_snippet_file)]
+#!endif
+
+# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following
+# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]'
+# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers):
+# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj]
+#
+# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak
+# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc
+# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a
+
+NULL=
+
+# For GDK resources
+
+!if [call create-lists.bat header resources_sources.mak GDK_RESOURCES]
+!endif
+
+!if [for %f in (..\..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_RESOURCES]
+!endif
+
+!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
+
+!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]
+!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]
+!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]
+!endif
+
+!if [for %s in (16 22 24 32 48) do @(for %c in (actions status categories) do @(for %f in (..\..\gtk\icons\%sx%s\%c\*.png) do @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %f in (..\..\gtk\inspector\*.ui ..\..\gtk\inspector\logo.png ..\..\gtk\emoji\emoji.data) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_DEMO_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\..\demos\gtk-demo ..\..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak ICON_BROWSER_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\..\demos\icon-browser --generate-dependencies ..\..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!include resources_sources.mak
+
+!if [del /f /q resources_sources.mak]
+!endif
\ No newline at end of file
diff --git a/build/win32/create-lists.bat b/build/win32/create-lists.bat
new file mode 100644
index 0000000000..ef60d5ce11
--- /dev/null
+++ b/build/win32/create-lists.bat
@@ -0,0 +1,42 @@
+@echo off
+rem Simple .bat script for creating the NMake Makefile snippets.
+
+if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd
+if "%2" == "" goto error_no_destfile
+
+if "%1" == "header" goto :header
+if "%1" == "file" goto :addfile
+if "%1" == "footer" goto :footer
+
+:header
+if "%3" == "" goto error_var
+echo %3 = \>>%2
+goto done
+
+:addfile
+if "%3" == "" goto error_file
+echo. %3 \>>%2
+goto done
+
+:footer
+echo. $(NULL)>>%2
+echo.>>%2
+goto done
+
+:error_cmd
+echo Specified command '%1' was invalid. Valid commands are: header file footer.
+goto done
+
+:error_no_destfile
+echo Destination NMake snippet file must be specified
+goto done
+
+:error_var
+echo A name must be specified for using '%1'.
+goto done
+
+:error_file
+echo A file must be specified for using '%1'.
+goto done
+
+:done
\ No newline at end of file
diff --git a/build/win32/gen-gdkversionmacros-h.py b/build/win32/gen-gdkversionmacros-h.py
new file mode 100644
index 0000000000..07558046dc
--- /dev/null
+++ b/build/win32/gen-gdkversionmacros-h.py
@@ -0,0 +1,33 @@
+#!/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, 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/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak
new file mode 100644
index 0000000000..c58fc5f4e6
--- /dev/null
+++ b/build/win32/generate-msvc.mak
@@ -0,0 +1,222 @@
+# NMake Makefile portion for code generation and
+# intermediate build directory creation
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.
+
+!include config-msvc.mak
+!include create-lists-msvc.mak
+
+# Copy the pre-defined gdkconfig.h.[win32|win32_broadway]
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
+GDK_OLD_CFG = debug
+!else
+GDK_OLD_CFG = release
+!endif
+
+!ifdef BROADWAY
+GDK_CONFIG = broadway
+GDK_DEL_CONFIG = win32
+GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32_broadway
+!else
+GDK_CONFIG = win32
+GDK_DEL_CONFIG = broadway
+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
+GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers
+GTK_RESOURCES_ARGS = ..\..\gtk\gtk.gresource.xml --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 \
+ ..\..\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
+..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32
+..\..\gtk\gtk-win32.rc: ..\..\gtk\gtk-win32.rc.body
+
+..\..\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
+ @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
+ @copy $** $@
+
+..\..\gdk\gdkconfig.h: ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
+
+..\..\config.h \
+..\..\gdk\gdkconfig.h \
+..\..\gtk\gtk-win32.rc \
+..\..\demos\gtk-demo\demos.h:
+ @echo Copying $@...
+ @copy $** $@
+
+..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in
+ @echo Generating $@...
+ @$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION)
+
+..\..\gdk\gdkmarshalers.h: ..\..\gdk\gdkmarshalers.list
+ @echo Generating $@...
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp
+ @move $@.tmp $@
+
+..\..\gdk\gdkmarshalers.c: ..\..\gdk\gdkmarshalers.list
+ @echo Generating $@...
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp
+ @move $@.tmp $@
+
+..\..\gdk\gdk.gresource.xml: $(GDK_RESOURCES)
+ @echo Generating $@...
+ @echo ^ >$@
+ @echo ^ >> $@
+ @echo ^ >> $@
+ @for %%f in (..\..\gdk\resources\glsl\*.glsl) do @echo ^resources/glsl/%%~nxf^ >> $@
+ @echo ^ >> $@
+ @echo ^ >> $@
+
+..\..\gdk\gdkresources.h: ..\..\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)
+ @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
+
+..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES)
+ @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)
+ @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
+
+..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
+ @echo Generating $@...
+ @$(PYTHON) replace.py \
+ --action=replace-var \
+ --input=$** --output=$@ \
+ --var=EXE_MANIFEST_ARCHITECTURE \
+ --outstring=*
+
+..\..\gtk\gtkdbusgenerated.h ..\..\gtk\gtkdbusgenerated.c: ..\..\gtk\gtkdbusinterfaces.xml
+ @echo Generating GTK DBus sources...
+ @$(PYTHON) $(PREFIX)\bin\gdbus-codegen \
+ --interface-prefix org.Gtk. --c-namespace _Gtk \
+ --generate-c-code gtkdbusgenerated $** \
+ --output-directory $(@D)
+
+..\..\gtk\gtktypefuncs.inc: ..\..\gtk\gentypefuncs.py
+ @echo Generating $@...
+ @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)
+ @echo Generating $@...
+ @echo ^> $@
+ @echo ^>> $@
+ @echo ^>> $@
+ @echo ^theme/Adwaita/gtk.css^ >> $@
+ @echo ^theme/Adwaita/gtk-dark.css^ >> $@
+ @echo ^theme/Adwaita/gtk-contained.css^ >> $@
+ @echo ^theme/Adwaita/gtk-contained-dark.css^ >> $@
+ @for %%f in (..\..\gtk\theme\Adwaita\assets\*.png) do @echo ^theme/Adwaita/assets/%%~nxf^ >> $@
+ @for %%f in (..\..\gtk\theme\Adwaita\assets\*.svg) do @echo ^theme/Adwaita/assets/%%~nxf^ >> $@
+ @echo ^theme/HighContrast/gtk.css^ >> $@
+ @echo ^theme/HighContrast/gtk-inverse.css^ >> $@
+ @echo ^theme/HighContrast/gtk-contained.css^ >> $@
+ @echo ^theme/HighContrast/gtk-contained-inverse.css^ >> $@
+ @for %%f in (..\..\gtk\theme\HighContrast\assets\*.png) do @echo ^theme/HighContrast/assets/%%~nxf^ >> $@
+ @for %%f in (..\..\gtk\theme\HighContrast\assets\*.svg) do @echo ^theme/HighContrast/assets/%%~nxf^ >> $@
+ @echo ^theme/win32/gtk-win32-base.css^ >> $@
+ @echo ^theme/win32/gtk.css^ >> $@
+ @for %%f in (..\..\gtk\cursor\*.png) do @echo ^cursor/%%~nxf^ >> $@
+ @for %%f in (..\..\gtk\gesture\*.symbolic.png) do @echo ^gesture/%%~nxf^ >> $@
+ @for %%f in (..\..\gtk\ui\*.ui) do @echo ^ui/%%~nxf^ >> $@
+ @for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\..\gtk\icons\%%sx%%s\%%c\*.png) do @echo ^icons/%%sx%%s/%%c/%%~nxf^ >> $@))
+ @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\..\gtk\icons\%%s\%%c\*.svg) do @echo ^icons/%%s/%%c/%%~nxf^ >> $@))
+ @for %%f in (..\..\gtk\inspector\*.ui) do @echo ^inspector/%%~nxf^ >> $@
+ @echo ^inspector/logo.png^ >> $@
+ @echo ^emoji/emoji.data^ >> $@
+ @echo ^ >> $@
+ @echo ^ >> $@
+
+..\..\gtk\gtkresources.h: ..\..\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)
+ @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header
+
+..\..\gtk\gtkresources.c: ..\..\gtk\gtk.gresource.xml $(GTK_RESOURCES)
+ @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)
+ @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source
+
+..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list
+ @echo Generating $@...
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp
+ @move $@.tmp $@
+
+..\..\gtk\gtkmarshalers.c: ..\..\gtk\gtkmarshalers.list
+ @echo Generating $@...
+ @echo #undef G_ENABLE_DEBUG> $@.tmp
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp
+ @move $@.tmp $@
+
+..\..\demos\gtk-demo\demo_resources.c: ..\..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES)
+ @echo Generating $@...
+ @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml
+
+..\..\demos\icon-browser\resources.c: ..\..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES)
+ @echo Generating $@...
+ @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
+
+# 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
+ @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
diff --git a/build/win32/introspection.body.mak b/build/win32/introspection.body.mak
index c05f3596a7..fb685e3c63 100644
--- a/build/win32/introspection.body.mak
+++ b/build/win32/introspection.body.mak
@@ -68,7 +68,7 @@ vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.gir: Gtk_3_0_gir_list
--include=Atk-1.0 \
--pkg-export=gtk+-3.0 \
--cflags-begin \
- -DG_LOG_USE_STRUCTURED=1 -DGTK_VERSION="3.24.10" -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../.. -I../../gtk -I../../gdk \
+ -DG_LOG_USE_STRUCTURED=1 -DGTK_VERSION="3.24.11" -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../.. -I../../gtk -I../../gdk \
--cflags-end \
--warn-all --include-uninstalled=./vs$(VSVER)/$(CFG)/$(PLAT)/bin/Gdk-3.0.gir \
--filelist=Gtk_3_0_gir_list \
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index f0ff2756f9..c17ee7fb70 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxprojin \
gdk3-win32.vcxproj.filtersin \
gdk3-broadway.vcxprojin \
diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in
index be9b93c827..44c1551940 100644
--- a/build/win32/vs10/Makefile.in
+++ b/build/win32/vs10/Makefile.in
@@ -408,11 +408,10 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxprojin \
- gdk3-win32.vcxproj.filtersin gdk3-broadway.vcxprojin \
- gdk3-broadway.vcxproj.filtersin broadwayd.vcxprojin \
- broadwayd.vcxproj.filtersin gdk-3.vcxprojin \
- gdk-3.vcxproj.filtersin gtk-3.vcxprojin \
+ gdk3-win32.vcxprojin gdk3-win32.vcxproj.filtersin \
+ gdk3-broadway.vcxprojin gdk3-broadway.vcxproj.filtersin \
+ broadwayd.vcxprojin broadwayd.vcxproj.filtersin \
+ gdk-3.vcxprojin gdk-3.vcxproj.filtersin gtk-3.vcxprojin \
gtk-3.vcxproj.filtersin gtk-builder-tool.vcxproj \
gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
diff --git a/build/win32/vs10/gtk-3.vcxproj b/build/win32/vs10/gtk-3.vcxproj
index 9751e6e050..481f65c847 100644
--- a/build/win32/vs10/gtk-3.vcxproj
+++ b/build/win32/vs10/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs10/gtk-3.vcxproj.filters b/build/win32/vs10/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs10/gtk-3.vcxproj.filters
+++ b/build/win32/vs10/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-3.vcxproj.filtersin
index b672d9b476..861d6d0d02 100644
--- a/build/win32/vs10/gtk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk-3.vcxproj.filtersin
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
#include "gtk-3.vs10.sourcefiles.filters"
Source Files
diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin
index c5629ccbd2..a528a4383c 100644
--- a/build/win32/vs10/gtk-3.vcxprojin
+++ b/build/win32/vs10/gtk-3.vcxprojin
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs10/gtk3-install.props b/build/win32/vs10/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs10/gtk3-install.props
+++ b/build/win32/vs10/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/build/win32/vs10/gtk3-prebuild.vcxproj
index 05e8131f3f..3f1e73bc6a 100644
--- a/build/win32/vs10/gtk3-prebuild.vcxproj
+++ b/build/win32/vs10/gtk3-prebuild.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
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj.filters b/build/win32/vs10/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs10/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs10/gtk3-version-paths.props b/build/win32/vs10/gtk3-version-paths.props
index 512e1c58c7..481e1ec412 100644
--- a/build/win32/vs10/gtk3-version-paths.props
+++ b/build/win32/vs10/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk3-version-paths.props.in
index 395c78f529..9ad33fdb42 100644
--- a/build/win32/vs10/gtk3-version-paths.props.in
+++ b/build/win32/vs10/gtk3-version-paths.props.in
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index d81e885371..7cc4fcd4f5 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxproj \
gdk3-win32.vcxproj.filters \
gdk-3.vcxproj \
diff --git a/build/win32/vs11/Makefile.in b/build/win32/vs11/Makefile.in
index be8f5c3d42..3d8e44c4c2 100644
--- a/build/win32/vs11/Makefile.in
+++ b/build/win32/vs11/Makefile.in
@@ -422,10 +422,9 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters gdk-3.vcxproj gdk-3.vcxproj.filters \
- gtk-3.vcxproj gtk-3.vcxproj.filters gtk-builder-tool.vcxproj \
- gtk-builder-tool.vcxproj.filters \
+ gdk3-win32.vcxproj gdk3-win32.vcxproj.filters gdk-3.vcxproj \
+ gdk-3.vcxproj.filters gtk-3.vcxproj gtk-3.vcxproj.filters \
+ gtk-builder-tool.vcxproj gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
gtk-encode-symbolic-svg.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
@@ -733,17 +732,17 @@ test-report perf-report full-report: ${TEST_PROGS}
# run make test-cwd as part of make check
check-local: test-cwd
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -757,7 +756,7 @@ check-local: test-cwd
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/win32/vs11/gtk-3.vcxproj b/build/win32/vs11/gtk-3.vcxproj
index b0f4116da3..1253e5b1bb 100644
--- a/build/win32/vs11/gtk-3.vcxproj
+++ b/build/win32/vs11/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs11/gtk-3.vcxproj.filters b/build/win32/vs11/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs11/gtk-3.vcxproj.filters
+++ b/build/win32/vs11/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs11/gtk3-gen-srcs.props b/build/win32/vs11/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs11/gtk3-gen-srcs.props
+++ b/build/win32/vs11/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs11/gtk3-install.props b/build/win32/vs11/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs11/gtk3-install.props
+++ b/build/win32/vs11/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs11/gtk3-prebuild.vcxproj b/build/win32/vs11/gtk3-prebuild.vcxproj
index 34ac9aa52c..b781d6a5a9 100644
--- a/build/win32/vs11/gtk3-prebuild.vcxproj
+++ b/build/win32/vs11/gtk3-prebuild.vcxproj
@@ -41,46 +41,46 @@
- Utility
+ Makefile
MultiByte
true
v110
- Utility
+ Makefile
MultiByte
v110
- Utility
+ Makefile
MultiByte
true
v110
- Utility
+ Makefile
MultiByte
v110
- Utility
+ Makefile
MultiByte
true
v110
- Utility
+ Makefile
MultiByte
v110
- Utility
+ Makefile
MultiByte
true
v110
- Utility
+ Makefile
MultiByte
v110
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs11/gtk3-prebuild.vcxproj.filters b/build/win32/vs11/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs11/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs11/gtk3-version-paths.props b/build/win32/vs11/gtk3-version-paths.props
index 72c307314f..516488f785 100644
--- a/build/win32/vs11/gtk3-version-paths.props
+++ b/build/win32/vs11/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 057aa5ff65..6485e38dcf 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxproj \
gdk3-win32.vcxproj.filters \
gdk-3.vcxproj \
diff --git a/build/win32/vs12/Makefile.in b/build/win32/vs12/Makefile.in
index e3d5fc937e..e332b254d1 100644
--- a/build/win32/vs12/Makefile.in
+++ b/build/win32/vs12/Makefile.in
@@ -422,10 +422,9 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters gdk-3.vcxproj gdk-3.vcxproj.filters \
- gtk-3.vcxproj gtk-3.vcxproj.filters gtk-builder-tool.vcxproj \
- gtk-builder-tool.vcxproj.filters \
+ gdk3-win32.vcxproj gdk3-win32.vcxproj.filters gdk-3.vcxproj \
+ gdk-3.vcxproj.filters gtk-3.vcxproj gtk-3.vcxproj.filters \
+ gtk-builder-tool.vcxproj gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
gtk-encode-symbolic-svg.vcxproj.filters \
gtk-query-settings.vcxproj gtk-query-settings.vcxproj.filters \
@@ -732,17 +731,17 @@ test-report perf-report full-report: ${TEST_PROGS}
# run make test-cwd as part of make check
check-local: test-cwd
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -756,7 +755,7 @@ check-local: test-cwd
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/win32/vs12/gtk-3.vcxproj b/build/win32/vs12/gtk-3.vcxproj
index 7d06b0a879..00ff7b3d57 100644
--- a/build/win32/vs12/gtk-3.vcxproj
+++ b/build/win32/vs12/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs12/gtk-3.vcxproj.filters b/build/win32/vs12/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs12/gtk-3.vcxproj.filters
+++ b/build/win32/vs12/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs12/gtk3-gen-srcs.props b/build/win32/vs12/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs12/gtk3-gen-srcs.props
+++ b/build/win32/vs12/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs12/gtk3-install.props b/build/win32/vs12/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs12/gtk3-install.props
+++ b/build/win32/vs12/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs12/gtk3-prebuild.vcxproj b/build/win32/vs12/gtk3-prebuild.vcxproj
index c92e928153..e5067621dd 100644
--- a/build/win32/vs12/gtk3-prebuild.vcxproj
+++ b/build/win32/vs12/gtk3-prebuild.vcxproj
@@ -41,46 +41,46 @@
- Utility
+ Makefile
MultiByte
true
v120
- Utility
+ Makefile
MultiByte
v120
- Utility
+ Makefile
MultiByte
true
v120
- Utility
+ Makefile
MultiByte
v120
- Utility
+ Makefile
MultiByte
true
v120
- Utility
+ Makefile
MultiByte
v120
- Utility
+ Makefile
MultiByte
true
v120
- Utility
+ Makefile
MultiByte
v120
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs12/gtk3-prebuild.vcxproj.filters b/build/win32/vs12/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs12/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs12/gtk3-version-paths.props b/build/win32/vs12/gtk3-version-paths.props
index b672f6a1dc..be21ddf5e9 100644
--- a/build/win32/vs12/gtk3-version-paths.props
+++ b/build/win32/vs12/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index 67922fe7ac..ae1137e76d 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxproj \
gdk3-win32.vcxproj.filters \
gdk-3.vcxproj \
diff --git a/build/win32/vs14/Makefile.in b/build/win32/vs14/Makefile.in
index 302b1af07e..f408816671 100644
--- a/build/win32/vs14/Makefile.in
+++ b/build/win32/vs14/Makefile.in
@@ -422,10 +422,9 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters gdk-3.vcxproj gdk-3.vcxproj.filters \
- gtk-3.vcxproj gtk-3.vcxproj.filters gtk-builder-tool.vcxproj \
- gtk-builder-tool.vcxproj.filters \
+ gdk3-win32.vcxproj gdk3-win32.vcxproj.filters gdk-3.vcxproj \
+ gdk-3.vcxproj.filters gtk-3.vcxproj gtk-3.vcxproj.filters \
+ gtk-builder-tool.vcxproj gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
gtk-encode-symbolic-svg.vcxproj.filters \
gtk-query-settings.vcxproj gtk-query-settings.vcxproj.filters \
@@ -732,17 +731,17 @@ test-report perf-report full-report: ${TEST_PROGS}
# run make test-cwd as part of make check
check-local: test-cwd
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -756,7 +755,7 @@ check-local: test-cwd
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/win32/vs14/gtk-3.vcxproj b/build/win32/vs14/gtk-3.vcxproj
index fb35508e9d..88909abce1 100644
--- a/build/win32/vs14/gtk-3.vcxproj
+++ b/build/win32/vs14/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs14/gtk-3.vcxproj.filters b/build/win32/vs14/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs14/gtk-3.vcxproj.filters
+++ b/build/win32/vs14/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs14/gtk3-gen-srcs.props b/build/win32/vs14/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs14/gtk3-gen-srcs.props
+++ b/build/win32/vs14/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs14/gtk3-install.props b/build/win32/vs14/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs14/gtk3-install.props
+++ b/build/win32/vs14/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs14/gtk3-prebuild.vcxproj b/build/win32/vs14/gtk3-prebuild.vcxproj
index 2fe5dbde32..f745460934 100644
--- a/build/win32/vs14/gtk3-prebuild.vcxproj
+++ b/build/win32/vs14/gtk3-prebuild.vcxproj
@@ -41,46 +41,46 @@
- Utility
+ Makefile
MultiByte
true
v140
- Utility
+ Makefile
MultiByte
v140
- Utility
+ Makefile
MultiByte
true
v140
- Utility
+ Makefile
MultiByte
v140
- Utility
+ Makefile
MultiByte
true
v140
- Utility
+ Makefile
MultiByte
v140
- Utility
+ Makefile
MultiByte
true
v140
- Utility
+ Makefile
MultiByte
v140
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs14/gtk3-prebuild.vcxproj.filters b/build/win32/vs14/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs14/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs14/gtk3-version-paths.props b/build/win32/vs14/gtk3-version-paths.props
index df4927b015..bf0a8e9276 100644
--- a/build/win32/vs14/gtk3-version-paths.props
+++ b/build/win32/vs14/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs15/Makefile.am b/build/win32/vs15/Makefile.am
index 9164736cf5..a7a033a153 100644
--- a/build/win32/vs15/Makefile.am
+++ b/build/win32/vs15/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxproj \
gdk3-win32.vcxproj.filters \
gdk-3.vcxproj \
diff --git a/build/win32/vs15/Makefile.in b/build/win32/vs15/Makefile.in
index 7455d677a5..6f70b1cc3d 100644
--- a/build/win32/vs15/Makefile.in
+++ b/build/win32/vs15/Makefile.in
@@ -422,10 +422,9 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters gdk-3.vcxproj gdk-3.vcxproj.filters \
- gtk-3.vcxproj gtk-3.vcxproj.filters gtk-builder-tool.vcxproj \
- gtk-builder-tool.vcxproj.filters \
+ gdk3-win32.vcxproj gdk3-win32.vcxproj.filters gdk-3.vcxproj \
+ gdk-3.vcxproj.filters gtk-3.vcxproj gtk-3.vcxproj.filters \
+ gtk-builder-tool.vcxproj gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
gtk-encode-symbolic-svg.vcxproj.filters \
gtk-query-settings.vcxproj gtk-query-settings.vcxproj.filters \
@@ -733,17 +732,17 @@ test-report perf-report full-report: ${TEST_PROGS}
# run make test-cwd as part of make check
check-local: test-cwd
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -757,7 +756,7 @@ check-local: test-cwd
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/win32/vs15/gtk-3.vcxproj b/build/win32/vs15/gtk-3.vcxproj
index 695d76bd70..033fb095c0 100644
--- a/build/win32/vs15/gtk-3.vcxproj
+++ b/build/win32/vs15/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs15/gtk-3.vcxproj.filters b/build/win32/vs15/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs15/gtk-3.vcxproj.filters
+++ b/build/win32/vs15/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs15/gtk3-gen-srcs.props b/build/win32/vs15/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs15/gtk3-gen-srcs.props
+++ b/build/win32/vs15/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs15/gtk3-install.props b/build/win32/vs15/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs15/gtk3-install.props
+++ b/build/win32/vs15/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs15/gtk3-prebuild.vcxproj b/build/win32/vs15/gtk3-prebuild.vcxproj
index 70554b8d81..018214f61d 100644
--- a/build/win32/vs15/gtk3-prebuild.vcxproj
+++ b/build/win32/vs15/gtk3-prebuild.vcxproj
@@ -41,46 +41,46 @@
- Utility
+ Makefile
MultiByte
true
v141
- Utility
+ Makefile
MultiByte
v141
- Utility
+ Makefile
MultiByte
true
v141
- Utility
+ Makefile
MultiByte
v141
- Utility
+ Makefile
MultiByte
true
v141
- Utility
+ Makefile
MultiByte
v141
- Utility
+ Makefile
MultiByte
true
v141
- Utility
+ Makefile
MultiByte
v141
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs15/gtk3-prebuild.vcxproj.filters b/build/win32/vs15/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs15/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs15/gtk3-version-paths.props b/build/win32/vs15/gtk3-version-paths.props
index 1f94f3d438..0b0a41dce7 100644
--- a/build/win32/vs15/gtk3-version-paths.props
+++ b/build/win32/vs15/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs16/Makefile.am b/build/win32/vs16/Makefile.am
index c723b54100..989562e2bf 100644
--- a/build/win32/vs16/Makefile.am
+++ b/build/win32/vs16/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST += \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters \
gdk3-win32.vcxproj \
gdk3-win32.vcxproj.filters \
gdk-3.vcxproj \
diff --git a/build/win32/vs16/Makefile.in b/build/win32/vs16/Makefile.in
index 485268ad38..e8c1b5abad 100644
--- a/build/win32/vs16/Makefile.in
+++ b/build/win32/vs16/Makefile.in
@@ -422,10 +422,9 @@ GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
# initialize variables for unconditional += appending
EXTRA_DIST = README.txt gtk+.sln gtk3-prebuild.vcxproj \
- gtk3-prebuild.vcxproj.filters gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters gdk-3.vcxproj gdk-3.vcxproj.filters \
- gtk-3.vcxproj gtk-3.vcxproj.filters gtk-builder-tool.vcxproj \
- gtk-builder-tool.vcxproj.filters \
+ gdk3-win32.vcxproj gdk3-win32.vcxproj.filters gdk-3.vcxproj \
+ gdk-3.vcxproj.filters gtk-3.vcxproj gtk-3.vcxproj.filters \
+ gtk-builder-tool.vcxproj gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
gtk-encode-symbolic-svg.vcxproj.filters \
gtk-query-settings.vcxproj gtk-query-settings.vcxproj.filters \
@@ -733,17 +732,17 @@ test-report perf-report full-report: ${TEST_PROGS}
# run make test-cwd as part of make check
check-local: test-cwd
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
@@ -757,7 +756,7 @@ check-local: test-cwd
sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \
diff --git a/build/win32/vs16/gtk-3.vcxproj b/build/win32/vs16/gtk-3.vcxproj
index 43a3af612c..4ece94fe72 100644
--- a/build/win32/vs16/gtk-3.vcxproj
+++ b/build/win32/vs16/gtk-3.vcxproj
@@ -162,28 +162,6 @@
MachineX64
-
-
- Generating GTK+ DBus Sources...
- $(GenerateGtkDbusBuiltSources)
- ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)
-
-
- Copying GTK+ Win32 Version Resource...
- $(CopyGtkWin32RC)
- ..\..\..\gtk\gtk-win32.rc;%(Outputs)
-
-
- Generating GTK+ Win32 Manifest...
- $(GenerateGtkWin32Manifest)
- ..\..\..\gtk\libgtk3.manifest;%(Outputs)
-
-
- Generating ..\..\..\gtk\gtktypefuncs.inc
- $(GenerateTypeFuncs)
- ..\..\..\gtk\gtktypefuncs.inc
-
-
@@ -206,6 +184,7 @@
+
diff --git a/build/win32/vs16/gtk-3.vcxproj.filters b/build/win32/vs16/gtk-3.vcxproj.filters
index 01e4abda15..521c0aad69 100644
--- a/build/win32/vs16/gtk-3.vcxproj.filters
+++ b/build/win32/vs16/gtk-3.vcxproj.filters
@@ -17,12 +17,6 @@
Resource Files
-
- Resource Files
- Resource Files
- Resource Files
- Resource Files
-
Source Files
Source Files
@@ -42,6 +36,7 @@
Source Files
Source Files
Source Files
+ Source Files
Source Files
Source Files
Source Files
diff --git a/build/win32/vs16/gtk3-gen-srcs.props b/build/win32/vs16/gtk3-gen-srcs.props
index 0865564f77..6a5edb7ce4 100644
--- a/build/win32/vs16/gtk3-gen-srcs.props
+++ b/build/win32/vs16/gtk3-gen-srcs.props
@@ -4,83 +4,28 @@
- copy ..\..\..\config.h.win32 ..\..\..\config.h
-
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-
-
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-
- $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
- cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)
- copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc
- $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*
- copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h
-
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-
+ 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
-
- $(GenConfigH)
+
+ $(GenerateRequiredSourcesBase)
-
- $(GenGdkConfigHWin32)
+
+ $(GeneratedGdkSources)
-
- $(GenGdkConfigHBroadway)
+
+ $(GeneratedGtkSources)
-
- $(GDbusCodeGenCmd)
-
-
- $(GenerateGtkDbusBuiltSources)
-
-
- $(CopyGtkWin32RC)
-
-
- $(GenerateGtkWin32Manifest)
-
-
- $(CopyDemosH)
-
-
- $(GenerateTypeFuncs)
+
+ $(GeneratedDemoSources)
diff --git a/build/win32/vs16/gtk3-install.props b/build/win32/vs16/gtk3-install.props
index 821fdeb8da..3d57a60c00 100644
--- a/build/win32/vs16/gtk3-install.props
+++ b/build/win32/vs16/gtk3-install.props
@@ -409,6 +409,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs16/gtk3-prebuild.vcxproj b/build/win32/vs16/gtk3-prebuild.vcxproj
index ef83927b53..6039b42128 100644
--- a/build/win32/vs16/gtk3-prebuild.vcxproj
+++ b/build/win32/vs16/gtk3-prebuild.vcxproj
@@ -41,46 +41,46 @@
- Utility
+ Makefile
MultiByte
true
v142
- Utility
+ Makefile
MultiByte
v142
- Utility
+ Makefile
MultiByte
true
v142
- Utility
+ Makefile
MultiByte
v142
- Utility
+ Makefile
MultiByte
true
v142
- Utility
+ Makefile
MultiByte
v142
- Utility
+ Makefile
MultiByte
true
v142
- Utility
+ Makefile
MultiByte
v142
@@ -121,121 +121,19 @@
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
- $(GlibEtcInstallRoot)\
-
+ $(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) clean
+ $(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
+ $(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
- Copying config.h from config.h.win32...
- $(GenConfigH)
- ..\..\..\config.h;%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
- Copying gdkconfig from gdkconfig.win32...
- $(GenGdkConfigHWin32)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)
-
-
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
- Copying gdkconfig from gdkconfig.win32_broadway...
- $(GenGdkConfigHBroadway)
- ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)
-
-
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
- Copying demos.h from demos.h.win32...
- $(CopyDemosH)
- ..\..\..\demos\gtk-demo\demos.h;%(Outputs)
-
-
diff --git a/build/win32/vs16/gtk3-prebuild.vcxproj.filters b/build/win32/vs16/gtk3-prebuild.vcxproj.filters
deleted file mode 100644
index f97b21d08b..0000000000
--- a/build/win32/vs16/gtk3-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +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
- Resource Files
- Resource Files
-
-
diff --git a/build/win32/vs16/gtk3-version-paths.props b/build/win32/vs16/gtk3-version-paths.props
index 087b366b4e..9c6a703252 100644
--- a/build/win32/vs16/gtk3-version-paths.props
+++ b/build/win32/vs16/gtk3-version-paths.props
@@ -5,7 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
- 3.24.10
+ 3.24.11
lib
.0-0
@@ -17,11 +17,13 @@
c:\python34
c:\python36
c:\python36
+ c:\python36
c:\python34.x64
c:\python34.x64
c:\python34.x64
c:\python36.x64
c:\python36.x64
+ c:\python36.x64
PYTHON=$(PythonDir)\python.exe
diff --git a/build/win32/vs9/gtk-3.vcproj b/build/win32/vs9/gtk-3.vcproj
index f5f0c8bc9e..d8a32ee83b 100644
--- a/build/win32/vs9/gtk-3.vcproj
+++ b/build/win32/vs9/gtk-3.vcproj
@@ -162,126 +162,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -308,6 +188,7 @@
+
diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-3.vcprojin
index 55218a7573..112ab5aff1 100644
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/build/win32/vs9/gtk-3.vcprojin
@@ -162,126 +162,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops
index b74bf9a71f..8e8f184750 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk3-gen-srcs.vsprops
@@ -6,96 +6,19 @@
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
>
-
-
-
-
-
-
-
diff --git a/build/win32/vs9/gtk3-install.vsprops b/build/win32/vs9/gtk3-install.vsprops
index 85223e22ab..d3cdd556eb 100644
--- a/build/win32/vs9/gtk3-install.vsprops
+++ b/build/win32/vs9/gtk3-install.vsprops
@@ -414,6 +414,7 @@ copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a1
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
+copy ..\..\..\gtk\a11y\gtkheaderbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkheaderbaraccessible.h
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/build/win32/vs9/gtk3-prebuild.vcproj
index 58751b42f2..7c328f7274 100644
--- a/build/win32/vs9/gtk3-prebuild.vcproj
+++ b/build/win32/vs9/gtk3-prebuild.vcproj
@@ -21,262 +21,127 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/win32/vs9/gtk3-version-paths.vsprops b/build/win32/vs9/gtk3-version-paths.vsprops
index 1d3c5dd31b..9445fb1830 100644
--- a/build/win32/vs9/gtk3-version-paths.vsprops
+++ b/build/win32/vs9/gtk3-version-paths.vsprops
@@ -22,7 +22,7 @@
/>
header file. */
-#undef HAVE_CRT_EXTERNS_H
-
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
@@ -225,15 +222,9 @@
/* Define if _NL_TIME_FIRST_WEEKDAY is available */
#undef HAVE__NL_TIME_FIRST_WEEKDAY
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-#undef HAVE__NSGETENVIRON
-
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
-/* Define if needed for xReply */
-#undef NEED_XIPROTO_H_FOR_XREPLY
-
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
diff --git a/config.h.meson b/config.h.meson
index 3e6c518478..93495755d5 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -20,9 +20,6 @@
/* define if we have colord */
#mesondefine HAVE_COLORD
-/* Define to 1 if you have the header file. */
-#mesondefine HAVE_CRT_EXTERNS_H
-
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#mesondefine HAVE_DCGETTEXT
@@ -209,12 +206,6 @@
/* Define if _NL_TIME_FIRST_WEEKDAY is available */
#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-#mesondefine HAVE__NSGETENVIRON
-
-/* Define if needed for xReply */
-#mesondefine NEED_XIPROTO_H_FOR_XREPLY
-
/* Define to the address where bug reports for this package should be sent. */
#mesondefine PACKAGE_BUGREPORT
diff --git a/config.h.win32 b/config.h.win32
index 71ded6fca1..4941e97f9d 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -26,9 +26,6 @@
/* define if we have colord */
/* #undef HAVE_COLORD */
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
/* Define to 1 if you have the `dcgettext' function. */
#define HAVE_DCGETTEXT 1
@@ -248,16 +245,10 @@
/* Define if _NL_TIME_FIRST_WEEKDAY is available */
/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR ".libs/"
-/* Define if needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#ifndef _MSC_VER
/* #undef NO_MINUS_C_MINUS_O */
@@ -272,7 +263,7 @@
#define PACKAGE_NAME "gtk+"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ 3.24.10"
+#define PACKAGE_STRING "gtk+ 3.24.11"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gtk+"
@@ -281,7 +272,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.24.10"
+#define PACKAGE_VERSION "3.24.11"
/* Use NSBundle functions to determine load paths for libraries, translations,
etc. */
diff --git a/config.h.win32.in b/config.h.win32.in
index 3a5219e5a2..62fe46149c 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -26,9 +26,6 @@
/* define if we have colord */
/* #undef HAVE_COLORD */
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
/* Define to 1 if you have the `dcgettext' function. */
#define HAVE_DCGETTEXT 1
@@ -248,16 +245,10 @@
/* Define if _NL_TIME_FIRST_WEEKDAY is available */
/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR ".libs/"
-/* Define if needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#ifndef _MSC_VER
/* #undef NO_MINUS_C_MINUS_O */
diff --git a/configure b/configure
index 9ddd57aa26..8c858b8904 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtk+ 3.24.10.
+# Generated by GNU Autoconf 2.69 for gtk+ 3.24.11.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gtk+'
PACKAGE_TARNAME='gtk+'
-PACKAGE_VERSION='3.24.10'
-PACKAGE_STRING='gtk+ 3.24.10'
+PACKAGE_VERSION='3.24.11'
+PACKAGE_STRING='gtk+ 3.24.11'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
PACKAGE_URL=''
@@ -1671,7 +1671,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtk+ 3.24.10 to adapt to many kinds of systems.
+\`configure' configures gtk+ 3.24.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1745,7 +1745,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtk+ 3.24.10:";;
+ short | recursive ) echo "Configuration of gtk+ 3.24.11:";;
esac
cat <<\_ACEOF
@@ -1990,7 +1990,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtk+ configure 3.24.10
+gtk+ configure 3.24.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2706,60 +2706,6 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_decl
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
# ----------------------------------------------------
# Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2816,11 +2762,65 @@ $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_member
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtk+ $as_me 3.24.10, which was
+It was created by gtk+ $as_me 3.24.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3297,7 +3297,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=GLIB_VERSION_2_52 -DGLIB_MAX_ALLOWED_VERSION=GLIB_VERSION_2_54"
+GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=GLIB_VERSION_2_56 -DGLIB_MAX_ALLOWED_VERSION=GLIB_VERSION_2_58"
@@ -3312,7 +3312,7 @@ GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=GLIB_VERSION_2_52 -DGLIB_MAX_AL
-GLIB_REQUIRED_VERSION=2.53.4
+GLIB_REQUIRED_VERSION=2.57.2
PANGO_REQUIRED_VERSION=1.41.0
ATK_REQUIRED_VERSION=2.15.1
CAIRO_REQUIRED_VERSION=1.14.0
@@ -3815,7 +3815,7 @@ fi
# Define the identity of the package.
PACKAGE='gtk+'
- VERSION='3.24.10'
+ VERSION='3.24.11'
# Some tools Automake needs.
@@ -4095,10 +4095,10 @@ AM_BACKSLASH='\'
GTK_MAJOR_VERSION=3
GTK_MINOR_VERSION=24
-GTK_MICRO_VERSION=10
-GTK_INTERFACE_AGE=6
-GTK_BINARY_AGE=2410
-GTK_VERSION=3.24.10
+GTK_MICRO_VERSION=11
+GTK_INTERFACE_AGE=7
+GTK_BINARY_AGE=2411
+GTK_VERSION=3.24.11
GTK_API_VERSION=3.0
GTK_BINARY_VERSION=3.0.0
@@ -4120,7 +4120,7 @@ GTK_BINARY_VERSION=3.0.0
-LT_VERSION_INFO="2404:6:2404"
+LT_VERSION_INFO="2404:7:2404"
LT_CURRENT_MINUS_AGE=0
@@ -21051,7 +21051,7 @@ Usage: $0 [OPTIONS]
Report bugs to ."
lt_cl_version="\
-gtk+ config.lt 3.24.10
+gtk+ config.lt 3.24.11
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -23252,7 +23252,7 @@ $as_echo "no" >&6; }
fi
fi
-WAYLAND_DEPENDENCIES="wayland-client >= 1.9.91 wayland-protocols >= 1.12 xkbcommon >= 0.2.0 wayland-cursor >= 1.9.91 wayland-egl"
+WAYLAND_DEPENDENCIES="wayland-client >= 1.9.91 wayland-protocols >= 1.14 xkbcommon >= 0.2.0 wayland-cursor >= 1.9.91 wayland-egl"
if test "$enable_wayland_backend" = "maybe" ; then
# Extract the first word of "wayland-scanner", so it can be a program name with args.
set dummy wayland-scanner; ac_word=$2
@@ -23603,12 +23603,12 @@ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null`
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -23620,12 +23620,12 @@ if test -n "$BASE_DEPENDENCIES_LIBS"; then
pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null`
+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -23646,14 +23646,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1`
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1`
else
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1`
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-2.0 >= 2.53.4 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0) were not met:
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0) were not met:
$BASE_DEPENDENCIES_PKG_ERRORS
@@ -24406,7 +24406,7 @@ else
fi
- min_glib_version=2.53.4
+ min_glib_version=2.57.2
pkg_config_args="glib-2.0 >= $min_glib_version"
for module in . gobject gmodule-no-export
do
@@ -24900,7 +24900,7 @@ rm -f core conftest.err conftest.$ac_objext \
GLIB_MKENUMS=""
GLIB_COMPILE_RESOURCES=""
as_fn_error $? "
-*** GLIB 2.53.4 or better is required. The latest version of
+*** GLIB 2.57.2 or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
fi
rm -f conf.glibtest
@@ -25441,31 +25441,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-# Checks for gdkspawn
-for ac_header in crt_externs.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default"
-if test "x$ac_cv_header_crt_externs_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_CRT_EXTERNS_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_func in _NSGetEnviron
-do :
- ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron"
-if test "x$ac_cv_func__NSGetEnviron" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE__NSGETENVIRON 1
-_ACEOF
-
-fi
-done
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build dynamic modules" >&5
$as_echo_n "checking whether to build dynamic modules... " >&6; }
@@ -26504,27 +26479,6 @@ else
fi
- # Check if is needed for xReply.
-
- ac_fn_c_check_type "$LINENO" "xReply" "ac_cv_type_xReply" "#include
-"
-if test "x$ac_cv_type_xReply" = xyes; then :
-
-else
- ac_fn_c_check_type "$LINENO" "xReply" "ac_cv_type_xReply" "#include
- #include
-"
-if test "x$ac_cv_type_xReply" = xyes; then :
-
-$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h
-
-else
- as_fn_error $? "xReply type unavailable. X11 is too old" "$LINENO" 5
-fi
-
-fi
-
-
# Check for XKB support.
if test "x$enable_xkb" = "xyes"; then
@@ -26892,12 +26846,12 @@ if test "$os_win32" != "yes"; then
have_gio_unix=yes
fi
if test "$have_gio_unix" = "yes"; then
- GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.53.4"
+ GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.57.2"
$as_echo "#define HAVE_GIO_UNIX 1" >>confdefs.h
else
- GDK_GIO_PACKAGE="gio-2.0 >= 2.53.4"
+ GDK_GIO_PACKAGE="gio-2.0 >= 2.57.2"
fi
# Check for Pango flags
@@ -27201,13 +27155,13 @@ $as_echo "yes" >&6; }
fi
-GTK_PACKAGES="atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.53.4"
+GTK_PACKAGES="atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.57.2"
GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= 1.4 fribidi >= 0.19.7"
if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
fi
if test "$have_gio_unix" = "yes"; then
- GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.53.4"
+ GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.57.2"
fi
GTK_EXTRA_LIBS=
@@ -29303,7 +29257,7 @@ else
fi
-ac_config_files="$ac_config_files README INSTALL config.h.win32 gtk-zip.sh Makefile gdk-3.0.pc gtk+-3.0.pc gtk+-unix-print-3.0.pc gail-3.0.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl demos/widget-factory/Makefile demos/icon-browser/Makefile examples/Makefile examples/bp/Makefile examples/application1/Makefile examples/application2/Makefile examples/application3/Makefile examples/application4/Makefile examples/application5/Makefile examples/application6/Makefile examples/application7/Makefile examples/application8/Makefile examples/application9/Makefile examples/application10/Makefile tests/Makefile tests/visuals/Makefile testsuite/Makefile testsuite/a11y/Makefile testsuite/a11y/state/Makefile testsuite/css/Makefile testsuite/css/parser/Makefile testsuite/css/nodes/Makefile testsuite/css/style/Makefile testsuite/gdk/Makefile testsuite/gtk/Makefile testsuite/reftests/Makefile testsuite/tools/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/gtk3.types docs/reference/gtk/version.xml docs/reference/gtk/getting_started.xml docs/reference/libgail-util/Makefile docs/reference/libgail-util/version.xml docs/tools/Makefile build/Makefile build/win32/Makefile build/win32/vs9/Makefile build/win32/vs9/gtk3-version-paths.vsprops build/win32/vs10/Makefile build/win32/vs10/gtk3-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile build/win32/vs15/Makefile build/win32/vs16/Makefile gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/wayland/Makefile gdk/mir/Makefile gdk/gdkversionmacros.h gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc.body gtk/libgtk3.manifest libgail-util/Makefile modules/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/cloudprint/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/papi/Makefile modules/printbackends/test/Makefile"
+ac_config_files="$ac_config_files README INSTALL config.h.win32 gtk-zip.sh Makefile gdk-3.0.pc gtk+-3.0.pc gtk+-unix-print-3.0.pc gail-3.0.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl demos/widget-factory/Makefile demos/icon-browser/Makefile examples/Makefile examples/bp/Makefile examples/application1/Makefile examples/application2/Makefile examples/application3/Makefile examples/application4/Makefile examples/application5/Makefile examples/application6/Makefile examples/application7/Makefile examples/application8/Makefile examples/application9/Makefile examples/application10/Makefile tests/Makefile tests/visuals/Makefile testsuite/Makefile testsuite/a11y/Makefile testsuite/a11y/state/Makefile testsuite/css/Makefile testsuite/css/parser/Makefile testsuite/css/nodes/Makefile testsuite/css/style/Makefile testsuite/gdk/Makefile testsuite/gtk/Makefile testsuite/reftests/Makefile testsuite/tools/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/gtk3.types docs/reference/gtk/version.xml docs/reference/gtk/getting_started.xml docs/reference/libgail-util/Makefile docs/reference/libgail-util/version.xml docs/tools/Makefile build/Makefile build/win32/Makefile build/win32/config-msvc.mak build/win32/vs9/Makefile build/win32/vs9/gtk3-version-paths.vsprops build/win32/vs10/Makefile build/win32/vs10/gtk3-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile build/win32/vs15/Makefile build/win32/vs16/Makefile gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/wayland/Makefile gdk/mir/Makefile gdk/gdkversionmacros.h gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc.body gtk/libgtk3.manifest libgail-util/Makefile modules/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/cloudprint/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/papi/Makefile modules/printbackends/test/Makefile"
cat >confcache <<\_ACEOF
@@ -30112,7 +30066,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtk+ $as_me 3.24.10, which was
+This file was extended by gtk+ $as_me 3.24.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30178,7 +30132,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtk+ config.status 3.24.10
+gtk+ config.status 3.24.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -30761,6 +30715,7 @@ do
"docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile" ;;
"build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
"build/win32/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;;
+ "build/win32/config-msvc.mak") CONFIG_FILES="$CONFIG_FILES build/win32/config-msvc.mak" ;;
"build/win32/vs9/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/Makefile" ;;
"build/win32/vs9/gtk3-version-paths.vsprops") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/gtk3-version-paths.vsprops" ;;
"build/win32/vs10/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs10/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 9200972a9a..5a34049698 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@
m4_define([gtk_major_version], [3])
m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [10])
-m4_define([gtk_interface_age], [6])
+m4_define([gtk_micro_version], [11])
+m4_define([gtk_interface_age], [7])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
m4_define([gtk_version],
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [53])
-m4_define([glib_required_micro], [4])
+m4_define([glib_required_minor], [57])
+m4_define([glib_required_micro], [2])
m4_define([glib_required_version],
[glib_required_major.glib_required_minor.glib_required_micro])
m4_define([glib_min_required_minor],
@@ -61,7 +61,7 @@ m4_define([cairo_required_version], [1.14.0])
m4_define([gdk_pixbuf_required_version], [2.30.0])
m4_define([introspection_required_version], [1.39.0])
m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.12])
+m4_define([wayland_protocols_required_version], [1.14])
m4_define([mirclient_required_version], [0.22.0])
m4_define([mircookie_required_version], [0.17.0])
m4_define([epoxy_required_version], [1.4])
@@ -852,10 +852,6 @@ AC_CHECK_LIB(m,round,,)
AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
AC_CHECK_DECLS([isnan, isinf], [], [], [[#include ]])
-# Checks for gdkspawn
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNCS(_NSGetEnviron)
-
AC_MSG_CHECKING(whether to build dynamic modules)
AC_ARG_ENABLE(modules,
@@ -1055,17 +1051,6 @@ if test "x$enable_x11_backend" = xyes; then
AC_CHECK_FUNC(XextFindDisplay, :,
AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
- # Check if is needed for xReply.
-
- AC_CHECK_TYPE([xReply], ,
- [AC_CHECK_TYPE([xReply],
- [AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
- [Define if needed for xReply])],
- [AC_MSG_ERROR([xReply type unavailable. X11 is too old])],
- [[#include
- #include ]])],
- [[#include ]])
-
# Check for XKB support.
if test "x$enable_xkb" = "xyes"; then
@@ -1963,6 +1948,7 @@ docs/reference/libgail-util/version.xml
docs/tools/Makefile
build/Makefile
build/win32/Makefile
+build/win32/config-msvc.mak
build/win32/vs9/Makefile
build/win32/vs9/gtk3-version-paths.vsprops
build/win32/vs10/Makefile
diff --git a/docs/reference/gdk/html/GdkDevice.html b/docs/reference/gdk/html/GdkDevice.html
index c7cfcb4876..24c10cf890 100644
--- a/docs/reference/gdk/html/GdkDevice.html
+++ b/docs/reference/gdk/html/GdkDevice.html
@@ -8,7 +8,7 @@
-
+
@@ -571,23 +571,23 @@ compose GSettings paths to store settings for this dev
15
16
17
- static GSettings *
-get_device_settings ( GdkDevice * device )
-{
- const gchar * vendor , * product ;
- GSettings * settings ;
- GdkDevice * device ;
- gchar * path ;
+ static GSettings *
+get_device_settings ( GdkDevice * device )
+{
+ const gchar * vendor , * product ;
+ GSettings * settings ;
+ GdkDevice * device ;
+ gchar * path ;
- vendor = gdk_device_get_vendor_id ( device );
- product = gdk_device_get_product_id ( device );
+ vendor = gdk_device_get_vendor_id ( device );
+ product = gdk_device_get_product_id ( device );
- path = g_strdup_printf ( "/org/example/app/devices/%s:%s/" , vendor , product );
- settings = g_settings_new_with_path ( DEVICE_SCHEMA , path );
- g_free ( path );
+ path = g_strdup_printf ( "/org/example/app/devices/%s:%s/" , vendor , product );
+ settings = g_settings_new_with_path ( DEVICE_SCHEMA , path );
+ g_free ( path );
- return settings ;
-}
+ return settings ;
+}
@@ -1274,7 +1274,7 @@ events that are emitted when the grab ends unvoluntarily.
device
-a GdkDevice . To get the device you can use gtk_get_current_event_device()
+
a GdkDevice . To get the device you can use gtk_get_current_event_device()
or gdk_event_get_device()
if the grab is in reaction to an event. Also, you can use
gdk_device_manager_get_client_pointer()
but only in code that isn’t triggered by a
GdkEvent and there aren’t other means to get a meaningful GdkDevice to operate on.
@@ -1974,7 +1974,7 @@ sort of pen is being used, such as an airbrush or a pencil.
GDK_SOURCE_MOUSE
the device is a mouse. (This will be reported for the core
-pointer, even if it is something else, such as a trackball.)
+ pointer, even if it is something else, such as a trackball.)
@@ -1989,7 +1989,7 @@ pointer, even if it is something else, such as a trackball.)
GDK_SOURCE_ERASER
the device is an eraser. Typically, this would be the other end
-of a stylus on a graphics tablet.
+ of a stylus on a graphics tablet.
@@ -2011,7 +2011,7 @@ of a stylus on a graphics tablet.
GDK_SOURCE_TOUCHSCREEN
the device is a direct-input touch device, such
-as a touchscreen or tablet. This device type has been added in 3.4.
+ as a touchscreen or tablet. This device type has been added in 3.4.
@@ -2019,7 +2019,7 @@ as a touchscreen or tablet. This device type has been added in 3.4.
GDK_SOURCE_TOUCHPAD
the device is an indirect touch device, such
-as a touchpad. This device type has been added in 3.4.
+ as a touchpad. This device type has been added in 3.4.
@@ -2027,7 +2027,7 @@ as a touchpad. This device type has been added in 3.4.
GDK_SOURCE_TRACKPOINT
the device is a trackpoint. This device type has been
-added in 3.22
+ added in 3.22
@@ -2035,8 +2035,8 @@ added in 3.22
GDK_SOURCE_TABLET_PAD
the device is a "pad", a collection of buttons,
-rings and strips found in drawing tablets. This device type has been
-added in 3.22.
+ rings and strips found in drawing tablets. This device type has been
+ added in 3.22.
@@ -2068,7 +2068,7 @@ added in 3.22.
GDK_MODE_SCREEN
the device is enabled. The device’s coordinate space
-maps to the entire screen.
+ maps to the entire screen.
@@ -2076,9 +2076,9 @@ maps to the entire screen.
GDK_MODE_WINDOW
the device is enabled. The device’s coordinate space
-is mapped to a single window. The manner in which this window
-is chosen is undefined, but it will typically be the same
-way in which the focus window for key events is determined.
+ is mapped to a single window. The manner in which this window
+ is chosen is undefined, but it will typically be the same
+ way in which the focus window for key events is determined.
@@ -2359,7 +2359,7 @@ for more information about the meaning of these device types.
GDK_DEVICE_TYPE_MASTER
Device is a master (or virtual) device. There will
-be an associated focus indicator on the screen.
+ be an associated focus indicator on the screen.
@@ -2374,7 +2374,7 @@ be an associated focus indicator on the screen.
GDK_DEVICE_TYPE_FLOATING
Device is a physical device, currently not attached to
-any virtual device.
+ any virtual device.
@@ -2632,7 +2632,7 @@ user_function (GdkDeviceTool *tool,
gpointer user_data)
The ::tool-changed signal is emitted on pen/eraser
-GdkDevices whenever tools enter or leave proximity.
+GdkDevices whenever tools enter or leave proximity.