[gtk+] Visual Studio builds: Update from [gdk|gtk]-3 to [gdk|gtk]-4
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Visual Studio builds: Update from [gdk|gtk]-3 to [gdk|gtk]-4
- Date: Wed, 19 Oct 2016 10:45:27 +0000 (UTC)
commit 8b8f378050c1baef1b25448ff95d1b1171cb8401
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Oct 19 18:39:36 2016 +0800
Visual Studio builds: Update from [gdk|gtk]-3 to [gdk|gtk]-4
This updates all the projects files to be be named appropriately as we move from GTK-3.x to 4.x,
and updates the autotools files so that things are distributed and generated properly.
Also remove deprecated/gtkstatusicon-quartz.c from gtk/Makefile.am, as that was causing 'make dist'
to fail as that file has been removed.
This fixes 'make dist' with the updated existing project files in proper order.
Note that this does not include the new GSK, which will be added later, so the project files do
not yet build the whole stack on Visual Studio at this point.
build/win32/Makefile.am | 8 +-
build/win32/gtk-introspection-msvc.mak | 2 +-
build/win32/gtkpc.py | 28 +--
build/win32/vs10/Makefile.am | 99 +++++------
build/win32/vs10/broadwayd.vcxprojin | 10 +-
build/win32/vs10/gailutil-3.vcxprojin | 188 --------------------
...3.vcxproj.filtersin => gdk-4.vcxproj.filtersin} | 2 +-
.../vs10/{gdk-3.vcxprojin => gdk-4.vcxprojin} | 24 ++--
...j.filtersin => gdk4-broadway.vcxproj.filtersin} | 2 +-
...-broadway.vcxprojin => gdk4-broadway.vcxprojin} | 14 +-
...proj.filtersin => gdk4-win32.vcxproj.filtersin} | 2 +-
.../{gdk3-win32.vcxprojin => gdk4-win32.vcxprojin} | 14 +-
build/win32/vs10/{gtk+.sln => gtk+-4.sln} | 18 +-
...3.vcxproj.filtersin => gtk-4.vcxproj.filtersin} | 6 +-
.../vs10/{gtk-3.vcxprojin => gtk-4.vcxprojin} | 26 ++--
build/win32/vs10/gtk-builder-tool.vcxproj | 12 +-
build/win32/vs10/gtk-encode-symbolic-svg.vcxproj | 10 +-
build/win32/vs10/gtk-query-settings.vcxproj | 12 +-
build/win32/vs10/gtk-update-icon-cache.vcxproj | 10 +-
.../vs10/gtk3-demo-application.vcxproj.filtersin | 20 --
...uild-defines.props => gtk4-build-defines.props} | 6 +-
...broadway.props => gtk4-copy-gdk-broadway.props} | 4 +-
...sin => gtk4-demo-application.vcxproj.filtersin} | 2 +-
...n.vcxprojin => gtk4-demo-application.vcxprojin} | 16 +-
...xproj.filtersin => gtk4-demo.vcxproj.filtersin} | 2 +-
.../{gtk3-demo.vcxprojin => gtk4-demo.vcxprojin} | 16 +-
.../{gtk3-gen-srcs.props => gtk4-gen-srcs.props} | 8 +-
...ltersin => gtk4-icon-browser.vcxproj.filtersin} | 2 +-
...owser.vcxprojin => gtk4-icon-browser.vcxprojin} | 16 +-
...e-broadway.props => gtk4-ignore-broadway.props} | 6 +-
.../{gtk3-install.propsin => gtk4-install.propsin} | 93 +++++------
.../{gtk3-install.vcxproj => gtk4-install.vcxproj} | 34 ++--
...cxproj.filters => gtk4-install.vcxproj.filters} | 0
...gtk3-prebuild.vcxproj => gtk4-prebuild.vcxproj} | 16 +-
...xproj.filters => gtk4-prebuild.vcxproj.filters} | 0
...-paths.props.in => gtk4-version-paths.props.in} | 4 +-
build/win32/vs11/Makefile.am | 52 +++---
build/win32/vs12/Makefile.am | 52 +++---
build/win32/vs14/Makefile.am | 52 +++---
build/win32/vs9/Makefile.am | 65 ++++----
build/win32/vs9/broadwayd.vcprojin | 8 +-
build/win32/vs9/gailutil-3.vcprojin | 183 -------------------
build/win32/vs9/{gdk-3.vcprojin => gdk-4.vcprojin} | 22 ++--
...k3-broadway.vcprojin => gdk4-broadway.vcprojin} | 12 +-
.../{gdk3-win32.vcprojin => gdk4-win32.vcprojin} | 14 +-
build/win32/vs9/{gtk+.sln => gtk+-4.sln} | 18 +-
build/win32/vs9/{gtk-3.vcprojin => gtk-4.vcprojin} | 26 ++--
build/win32/vs9/gtk-builder-tool.vcproj | 8 +-
build/win32/vs9/gtk-encode-symbolic-svg.vcproj | 8 +-
build/win32/vs9/gtk-query-settings.vcproj | 8 +-
build/win32/vs9/gtk-update-icon-cache.vcproj | 8 +-
...-defines.vsprops => gtk4-build-defines.vsprops} | 6 +-
...dway.vsprops => gtk4-copy-gdk-broadway.vsprops} | 4 +-
...ion.vcprojin => gtk4-demo-application.vcprojin} | 14 +-
.../vs9/{gtk3-demo.vcprojin => gtk4-demo.vcprojin} | 14 +-
...gtk3-gen-srcs.vsprops => gtk4-gen-srcs.vsprops} | 6 +-
...browser.vcprojin => gtk4-icon-browser.vcprojin} | 14 +-
...oadway.vsprops => gtk4-ignore-broadway.vsprops} | 6 +-
.../{gtk3-install.vcproj => gtk4-install.vcproj} | 36 ++--
...k3-install.vspropsin => gtk4-install.vspropsin} | 89 ++++-----
.../{gtk3-prebuild.vcproj => gtk4-prebuild.vcproj} | 20 +-
...hs.vsprops.in => gtk4-version-paths.vsprops.in} | 4 +-
configure.ac | 6 +-
demos/gtk-demo/Makefile.am | 2 +-
gdk/Makefile.am | 4 +-
gdk/broadway/Makefile.am | 16 +-
gdk/win32/Makefile.am | 16 +-
gtk/Makefile.am | 21 +--
gtk/{libgtk3.manifest.in => libgtk4.manifest.in} | 0
69 files changed, 555 insertions(+), 991 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index e1253da..60f01af 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -3,11 +3,11 @@ include $(top_srcdir)/Makefile.decl
if HAVE_INTROSPECTION
GENERATED_ITEMS = \
introspection.body.mak \
- Gdk_3_0_gir_list \
- GdkWin32_3_0_gir_list \
- Gtk_3_0_gir_list
+ Gdk_4_0_gir_list \
+ GdkWin32_4_0_gir_list \
+ Gtk_4_0_gir_list
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-3.0.gir.msvc.introspect GdkWin32-3.0.gir.msvc.introspect
Gtk-3.0.gir.msvc.introspect
+MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-4.0.gir.msvc.introspect GdkWin32-4.0.gir.msvc.introspect
Gtk-4.0.gir.msvc.introspect
introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-$(RM) introspection.body.mak
diff --git a/build/win32/gtk-introspection-msvc.mak b/build/win32/gtk-introspection-msvc.mak
index 2149650..c8617d5 100644
--- a/build/win32/gtk-introspection-msvc.mak
+++ b/build/win32/gtk-introspection-msvc.mak
@@ -2,7 +2,7 @@
!include detectenv-msvc.mak
-APIVERSION = 3.0
+APIVERSION = 4.0
CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py
index 97a33c0..4daff56 100644
--- a/build/win32/gtkpc.py
+++ b/build/win32/gtkpc.py
@@ -45,7 +45,7 @@ def main(argv):
gdk_backends += ' broadway'
cairo_backends += ' cairo'
- pkg_replace_items = {'@GTK_API_VERSION@': '3.0',
+ pkg_replace_items = {'@GTK_API_VERSION@': '4.0',
'@GDK_BACKENDS@': gdk_backends}
pkg_required_packages = 'gdk-pixbuf >= ' + gdk_pixbuf_min_ver + ' ' + \
@@ -58,10 +58,10 @@ def main(argv):
'@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
'@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs,
'@GDK_EXTRA_CFLAGS@': '',
- 'gdk-3': 'gdk-3.0'}
+ 'gdk-4': 'gdk-4.0'}
gtk_pc_replace_items = {'@host@': gdk_args.host,
- '@GTK_BINARY_VERSION@': '3.0.0',
+ '@GTK_BINARY_VERSION@': '4.0.0',
'@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \
pkg_required_packages + ' ' + \
gio_package,
@@ -69,29 +69,21 @@ def main(argv):
'@GTK_EXTRA_CFLAGS@': '',
'@GTK_EXTRA_LIBS@': '',
'@GTK_EXTRA_CFLAGS@': '',
- 'gtk-3': 'gtk-3.0'}
-
- gail_pc_replace_items = {'gailutil-3': 'gailutil-3.0'}
+ 'gtk-4': 'gtk-4.0'}
pkg_replace_items.update(base_pc.base_replace_items)
gdk_pc_replace_items.update(pkg_replace_items)
gtk_pc_replace_items.update(pkg_replace_items)
- gail_pc_replace_items.update(base_pc.base_replace_items)
- # Generate gdk-3.0.pc
- replace_multi(base_pc.top_srcdir + '/gdk-3.0.pc.in',
- base_pc.srcdir + '/gdk-3.0.pc',
+ # Generate gdk-4.0.pc
+ replace_multi(base_pc.top_srcdir + '/gdk-4.0.pc.in',
+ base_pc.srcdir + '/gdk-4.0.pc',
gdk_pc_replace_items)
- # Generate gtk+-3.0.pc
- replace_multi(base_pc.top_srcdir + '/gtk+-3.0.pc.in',
- base_pc.srcdir + '/gtk+-3.0.pc',
+ # Generate gtk+-4.0.pc
+ replace_multi(base_pc.top_srcdir + '/gtk+-4.0.pc.in',
+ base_pc.srcdir + '/gtk+-4.0.pc',
gtk_pc_replace_items)
- # Generate gail-3.0.pc
- replace_multi(base_pc.top_srcdir + '/gail-3.0.pc.in',
- base_pc.srcdir + '/gail-3.0.pc',
- gail_pc_replace_items)
-
if __name__ == '__main__':
sys.exit(main(sys.argv))
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 5358f96..9b98666 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,49 +1,46 @@
include $(top_srcdir)/Makefile.decl
GENERATED_ITEMS = \
- gdk3-win32.vcxproj \
- gdk3-win32.vcxproj.filters \
- gdk3-broadway.vcxproj \
- gdk3-broadway.vcxproj.filters \
+ gdk4-win32.vcxproj \
+ gdk4-win32.vcxproj.filters \
+ gdk4-broadway.vcxproj \
+ gdk4-broadway.vcxproj.filters \
broadwayd.vcxproj \
broadwayd.vcxproj.filters \
- gdk-3.vcxproj \
- gdk-3.vcxproj.filters \
- gtk-3.vcxproj \
- gtk-3.vcxproj.filters \
- gtk3-demo.vcxproj \
- gtk3-demo.vcxproj.filters \
- gtk3-demo-application.vcxproj \
- gtk3-demo-application.vcxproj.filters \
- gtk3-icon-browser.vcxproj \
- gtk3-icon-browser.vcxproj.filters \
- gailutil-3.vcxproj \
- gailutil-3.vcxproj.filters \
- gtk3-install.props \
- gtk3-version-paths.props
+ gdk-4.vcxproj \
+ gdk-4.vcxproj.filters \
+ gtk-4.vcxproj \
+ gtk-4.vcxproj.filters \
+ gtk4-demo.vcxproj \
+ gtk4-demo.vcxproj.filters \
+ gtk4-demo-application.vcxproj \
+ gtk4-demo-application.vcxproj.filters \
+ gtk4-icon-browser.vcxproj \
+ gtk4-icon-browser.vcxproj.filters \
+ gtk4-install.props \
+ gtk4-version-paths.props
MSVC10_HEADERS_LISTS = \
- gdk3-win32.vs10.headers \
- gdk3-broadway.vs10.headers \
- gdk-3.vs10.headers \
- gtk-3.vs10.headers \
- gailutil-3.vs10.headers
+ gdk4-win32.vs10.headers \
+ gdk4-broadway.vs10.headers \
+ gdk-4.vs10.headers \
+ gtk-4.vs10.headers
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 \
+ gtk+-4.sln \
+ gtk4-prebuild.vcxproj \
+ gtk4-prebuild.vcxproj.filters \
+ gdk4-win32.vcxprojin \
+ gdk4-win32.vcxproj.filtersin \
+ gdk4-broadway.vcxprojin \
+ gdk4-broadway.vcxproj.filtersin \
broadwayd.vcxprojin \
broadwayd.vcxproj.filtersin \
- gdk-3.vcxprojin \
- gdk-3.vcxproj.filtersin \
- gtk-3.vcxprojin \
- gtk-3.vcxproj.filtersin \
+ gdk-4.vcxprojin \
+ gdk-4.vcxproj.filtersin \
+ gtk-4.vcxprojin \
+ gtk-4.vcxproj.filtersin \
gtk-builder-tool.vcxproj \
gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
@@ -52,29 +49,27 @@ EXTRA_DIST += \
gtk-query-settings.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk3-demo.vcxprojin \
- gtk3-demo.vcxproj.filtersin \
- gtk3-demo-application.vcxprojin \
- gtk3-demo-application.vcxproj.filtersin \
- gtk3-icon-browser.vcxprojin \
- gtk3-icon-browser.vcxproj.filtersin \
- gailutil-3.vcxprojin \
- gailutil-3.vcxproj.filtersin \
- gtk3-install.vcxproj \
- gtk3-install.vcxproj.filters \
- gtk3-build-defines.props \
- gtk3-copy-gdk-broadway.props \
- gtk3-gen-srcs.props \
- gtk3-ignore-broadway.props \
- gtk3-install.propsin \
- gtk3-version-paths.props.in \
+ gtk4-demo.vcxprojin \
+ gtk4-demo.vcxproj.filtersin \
+ gtk4-demo-application.vcxprojin \
+ gtk4-demo-application.vcxproj.filtersin \
+ gtk4-icon-browser.vcxprojin \
+ gtk4-icon-browser.vcxproj.filtersin \
+ gtk4-install.vcxproj \
+ gtk4-install.vcxproj.filters \
+ gtk4-build-defines.props \
+ gtk4-copy-gdk-broadway.props \
+ gtk4-gen-srcs.props \
+ gtk4-ignore-broadway.props \
+ gtk4-install.propsin \
+ gtk4-version-paths.props.in \
$(GENERATED_ITEMS)
DISTCLEANFILES = \
$(GENERATED_ITEMS)
-gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@
+gtk4-install.props: $(top_srcdir)/build/win32/vs10/gtk4-install.propsin $(MSVC10_HEADERS_LISTS)
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk4-install.propsin >$@
rm $(MSVC10_HEADERS_LISTS)
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/broadwayd.vcxprojin b/build/win32/vs10/broadwayd.vcxprojin
index 163e9c5..14c5759 100644
--- a/build/win32/vs10/broadwayd.vcxprojin
+++ b/build/win32/vs10/broadwayd.vcxprojin
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -166,7 +166,7 @@
#include "broadwayd.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gtk3-prebuild.vcxproj">
+ <ProjectReference Include="gtk4-prebuild.vcxproj">
<Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gdk-3.vcxproj.filtersin b/build/win32/vs10/gdk-4.vcxproj.filtersin
similarity index 96%
rename from build/win32/vs10/gdk-3.vcxproj.filtersin
rename to build/win32/vs10/gdk-4.vcxproj.filtersin
index b618b92..6f24d8c 100644
--- a/build/win32/vs10/gdk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gdk-4.vcxproj.filtersin
@@ -18,7 +18,7 @@
<ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
</ItemGroup>
<ItemGroup>
-#include "gdk-3.vs10.sourcefiles.filters"
+#include "gdk-4.vs10.sourcefiles.filters"
<ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gdk-3.vcxprojin b/build/win32/vs10/gdk-4.vcxprojin
similarity index 96%
rename from build/win32/vs10/gdk-3.vcxprojin
rename to build/win32/vs10/gdk-4.vcxprojin
index 1de4b9a..109e387 100644
--- a/build/win32/vs10/gdk-3.vcxprojin
+++ b/build/win32/vs10/gdk-4.vcxprojin
@@ -36,7 +36,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}</ProjectGuid>
- <RootNamespace>gdk3</RootNamespace>
+ <RootNamespace>gdk4</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,35 +89,35 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-ignore-broadway.props" />
+ <Import Project="gtk4-ignore-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-ignore-broadway.props" />
+ <Import Project="gtk4-ignore-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-ignore-broadway.props" />
+ <Import Project="gtk4-ignore-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-ignore-broadway.props" />
+ <Import Project="gtk4-ignore-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-copy-gdk-broadway.props" />
+ <Import Project="gtk4-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-copy-gdk-broadway.props" />
+ <Import Project="gtk4-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-copy-gdk-broadway.props" />
+ <Import Project="gtk4-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-copy-gdk-broadway.props" />
+ <Import Project="gtk4-copy-gdk-broadway.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -314,15 +314,15 @@
<ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
</ItemGroup>
<ItemGroup>
-#include "gdk-3.vs10.sourcefiles"
+#include "gdk-4.vs10.sourcefiles"
<ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk3-broadway.vcxproj">
+ <ProjectReference Include="gdk4-broadway.vcxproj">
<Project>{1df4c475-4472-4ee4-ac2b-3ab5a4c1a453}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gdk3-win32.vcxproj">
+ <ProjectReference Include="gdk4-win32.vcxproj">
<Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gdk3-broadway.vcxproj.filtersin
b/build/win32/vs10/gdk4-broadway.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/gdk3-broadway.vcxproj.filtersin
rename to build/win32/vs10/gdk4-broadway.vcxproj.filtersin
index 539d511..8e7eae1 100644
--- a/build/win32/vs10/gdk3-broadway.vcxproj.filtersin
+++ b/build/win32/vs10/gdk4-broadway.vcxproj.filtersin
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gdk3-broadway.vs10.sourcefiles.filters"
+#include "gdk4-broadway.vs10.sourcefiles.filters"
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gdk3-broadway.vcxprojin b/build/win32/vs10/gdk4-broadway.vcxprojin
similarity index 95%
rename from build/win32/vs10/gdk3-broadway.vcxprojin
rename to build/win32/vs10/gdk4-broadway.vcxprojin
index d14fe37..c88e5c6 100644
--- a/build/win32/vs10/gdk3-broadway.vcxprojin
+++ b/build/win32/vs10/gdk4-broadway.vcxprojin
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}</ProjectGuid>
- <RootNamespace>gdkbroadway</RootNamespace>
+ <RootNamespace>gdk4broadway</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
@@ -117,10 +117,10 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gdk3-broadway.vs10.sourcefiles"
+#include "gdk4-broadway.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gtk3-prebuild.vcxproj">
+ <ProjectReference Include="gtk4-prebuild.vcxproj">
<Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gdk3-win32.vcxproj.filtersin b/build/win32/vs10/gdk4-win32.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/gdk3-win32.vcxproj.filtersin
rename to build/win32/vs10/gdk4-win32.vcxproj.filtersin
index f81bd05..36ba1ca 100644
--- a/build/win32/vs10/gdk3-win32.vcxproj.filtersin
+++ b/build/win32/vs10/gdk4-win32.vcxproj.filtersin
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gdk3-win32.vs10.sourcefiles.filters"
+#include "gdk4-win32.vs10.sourcefiles.filters"
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gdk3-win32.vcxprojin b/build/win32/vs10/gdk4-win32.vcxprojin
similarity index 95%
rename from build/win32/vs10/gdk3-win32.vcxprojin
rename to build/win32/vs10/gdk4-win32.vcxprojin
index c5f4d48..0030883 100644
--- a/build/win32/vs10/gdk3-win32.vcxprojin
+++ b/build/win32/vs10/gdk4-win32.vcxprojin
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}</ProjectGuid>
- <RootNamespace>gdkwin32</RootNamespace>
+ <RootNamespace>gdk4win32</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -117,10 +117,10 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gdk3-win32.vs10.sourcefiles"
+#include "gdk4-win32.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gtk3-prebuild.vcxproj">
+ <ProjectReference Include="gtk4-prebuild.vcxproj">
<Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+-4.sln
similarity index 93%
rename from build/win32/vs10/gtk+.sln
rename to build/win32/vs10/gtk+-4.sln
index 5056ecd..7b784d1 100644
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+-4.sln
@@ -1,22 +1,22 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcxproj",
"{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebuild.vcxproj",
"{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcxproj",
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win32", "gdk4-win32.vcxproj",
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcxproj",
"{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-broadway", "gdk4-broadway.vcxproj",
"{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj",
"{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcxproj",
"{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-4", "gdk-4.vcxproj",
"{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcxproj",
"{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-4", "gtk-4.vcxproj",
"{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj",
"{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo", "gtk4-demo.vcxproj",
"{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application",
"gtk3-demo-application.vcxproj", "{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo-application",
"gtk4-demo-application.vcxproj", "{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcxproj",
"{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-icon-browser", "gtk4-icon-browser.vcxproj",
"{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg",
"gtk-encode-symbolic-svg.vcxproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}"
EndProject
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-bui
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj",
"{9F22107A-3EF7-4B52-B269-747B65307F36}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj",
"{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-install", "gtk4-install.vcxproj",
"{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-4.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/gtk-3.vcxproj.filtersin
rename to build/win32/vs10/gtk-4.vcxproj.filtersin
index 319d20a..33162a2 100644
--- a/build/win32/vs10/gtk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk-4.vcxproj.filtersin
@@ -20,10 +20,10 @@
<ItemGroup>
<CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\gtk\libgtk4.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
-#include "gtk-3.vs10.sourcefiles.filters"
+#include "gtk-4.vs10.sourcefiles.filters"
<ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source
Files</Filter></ClCompile>
<ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
@@ -41,6 +41,6 @@
<ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
<ItemGroup>
- <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
+ <Manifest Include="..\..\..\gtk\libgtk4.manifest"><Filter>Resource Files</Filter></Manifest>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-4.vcxprojin
similarity index 95%
rename from build/win32/vs10/gtk-3.vcxprojin
rename to build/win32/vs10/gtk-4.vcxprojin
index b6b104c..86b98b5 100644
--- a/build/win32/vs10/gtk-3.vcxprojin
+++ b/build/win32/vs10/gtk-4.vcxprojin
@@ -22,7 +22,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}</ProjectGuid>
- <RootNamespace>gtk3</RootNamespace>
+ <RootNamespace>gtk4</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -191,26 +191,26 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGtkWin32RC)</Command>
<Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
+ <CustomBuild Include="..\..\..\gtk\libgtk4.manifest.in">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32
Manifest...</Message>
<Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32Manifest)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32
Manifest...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32Manifest)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32
Manifest...</Message>
<Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32Manifest)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32
Manifest...</Message>
<Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32Manifest)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
</ItemGroup>
<ItemGroup>
-#include "gtk-3.vs10.sourcefiles"
+#include "gtk-4.vs10.sourcefiles"
<ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
<ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
<ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
@@ -228,10 +228,10 @@
<ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
</ItemGroup>
<ItemGroup>
- <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
+ <Manifest Include="..\..\..\gtk\libgtk4.manifest" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/build/win32/vs10/gtk-builder-tool.vcxproj
index 1730019..e5771d2 100644
--- a/build/win32/vs10/gtk-builder-tool.vcxproj
+++ b/build/win32/vs10/gtk-builder-tool.vcxproj
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -166,11 +166,11 @@
<ClCompile Include="..\..\..\gtk\gtk-builder-tool.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
index 4d9858a..b910be5 100644
--- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
+++ b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -166,7 +166,7 @@
<ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/build/win32/vs10/gtk-query-settings.vcxproj
index 3c84329..8dd75d7 100644
--- a/build/win32/vs10/gtk-query-settings.vcxproj
+++ b/build/win32/vs10/gtk-query-settings.vcxproj
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -166,11 +166,11 @@
<ClCompile Include="..\..\..\gtk\gtk-query-settings.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/build/win32/vs10/gtk-update-icon-cache.vcxproj
index 7b795af..505b3fe 100644
--- a/build/win32/vs10/gtk-update-icon-cache.vcxproj
+++ b/build/win32/vs10/gtk-update-icon-cache.vcxproj
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -166,7 +166,7 @@
<ClCompile Include="..\..\..\gtk\updateiconcache.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gtk3-prebuild.vcxproj">
+ <ProjectReference Include="gtk4-prebuild.vcxproj">
<Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk3-build-defines.props b/build/win32/vs10/gtk4-build-defines.props
similarity index 96%
rename from build/win32/vs10/gtk3-build-defines.props
rename to build/win32/vs10/gtk4-build-defines.props
index d695642..f618190 100644
--- a/build/win32/vs10/gtk3-build-defines.props
+++ b/build/win32/vs10/gtk4-build-defines.props
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtk3-version-paths.props" />
+ <Import Project="gtk4-version-paths.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <GtkBinaryVersion>3.0.0</GtkBinaryVersion>
+ <GtkBinaryVersion>4.0.0</GtkBinaryVersion>
<GtkDummyPrefix>/dummy</GtkDummyPrefix>
<GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
<GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
@@ -16,7 +16,7 @@
<GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4builddefinesprops</_PropertySheetDisplayName>
<OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
</PropertyGroup>
diff --git a/build/win32/vs10/gtk3-copy-gdk-broadway.props b/build/win32/vs10/gtk4-copy-gdk-broadway.props
similarity index 91%
rename from build/win32/vs10/gtk3-copy-gdk-broadway.props
rename to build/win32/vs10/gtk4-copy-gdk-broadway.props
index 227b0da..4901b2f 100644
--- a/build/win32/vs10/gtk3-copy-gdk-broadway.props
+++ b/build/win32/vs10/gtk4-copy-gdk-broadway.props
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3copygdkbroadwayprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4copygdkbroadwayprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
diff --git a/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
b/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
similarity index 93%
rename from build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
rename to build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
index 2063a07..4631343 100644
--- a/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
+++ b/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gtk3-icon-browser.vs10.sourcefiles.filters"
+#include "gtk4-demo-application.vs10.sourcefiles.filters"
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gtk3-demo-application.vcxprojin
b/build/win32/vs10/gtk4-demo-application.vcxprojin
similarity index 95%
rename from build/win32/vs10/gtk3-demo-application.vcxprojin
rename to build/win32/vs10/gtk4-demo-application.vcxprojin
index 6ff02c8..7bd290b 100644
--- a/build/win32/vs10/gtk3-demo-application.vcxprojin
+++ b/build/win32/vs10/gtk4-demo-application.vcxprojin
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}</ProjectGuid>
- <RootNamespace>gtk3demoapplication</RootNamespace>
+ <RootNamespace>gtk4demoapplication</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -155,14 +155,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gtk3-demo-application.vs10.sourcefiles"
+#include "gtk4-demo-application.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk3-demo.vcxproj.filtersin b/build/win32/vs10/gtk4-demo.vcxproj.filtersin
similarity index 92%
rename from build/win32/vs10/gtk3-demo.vcxproj.filtersin
rename to build/win32/vs10/gtk4-demo.vcxproj.filtersin
index a8fa97d..7ffdcf6 100644
--- a/build/win32/vs10/gtk3-demo.vcxproj.filtersin
+++ b/build/win32/vs10/gtk4-demo.vcxproj.filtersin
@@ -11,6 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gtk3-demo.vs10.sourcefiles.filters"
+#include "gtk4-demo.vs10.sourcefiles.filters"
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gtk3-demo.vcxprojin b/build/win32/vs10/gtk4-demo.vcxprojin
similarity index 96%
rename from build/win32/vs10/gtk3-demo.vcxprojin
rename to build/win32/vs10/gtk4-demo.vcxprojin
index 0abda49..31df52c 100644
--- a/build/win32/vs10/gtk3-demo.vcxprojin
+++ b/build/win32/vs10/gtk4-demo.vcxprojin
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}</ProjectGuid>
- <RootNamespace>gtk3demo</RootNamespace>
+ <RootNamespace>gtk4demo</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -169,14 +169,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gtk3-demo.vs10.sourcefiles"
+#include "gtk4-demo.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk4-gen-srcs.props
similarity index 93%
rename from build/win32/vs10/gtk3-gen-srcs.props
rename to build/win32/vs10/gtk4-gen-srcs.props
index e5e9c02..53555c3 100644
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk4-gen-srcs.props
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2004";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
@@ -42,11 +42,11 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
<GenerateGtkDbusBuiltSources>cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd
$(SolutionDir)</GenerateGtkDbusBuiltSources>
<GenerateGtkDbusBuiltSourcesX64>cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) &
cd $(SolutionDir)</GenerateGtkDbusBuiltSourcesX64>
<CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
- <GenerateGtkWin32Manifest>$(PythonPath)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
+ <GenerateGtkWin32Manifest>$(PythonPath)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk4.manifest.in --output=..\..\..\gtk\libgtk4.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
<CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4gensrcsprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="GenConfigH">
diff --git a/build/win32/vs10/gailutil-3.vcxproj.filtersin
b/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
similarity index 93%
rename from build/win32/vs10/gailutil-3.vcxproj.filtersin
rename to build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
index 5f3a5bc..4ff5822 100644
--- a/build/win32/vs10/gailutil-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gailutil-3.vs10.sourcefiles.filters"
+#include "gtk4-icon-browser.vs10.sourcefiles.filters"
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gtk3-icon-browser.vcxprojin b/build/win32/vs10/gtk4-icon-browser.vcxprojin
similarity index 95%
rename from build/win32/vs10/gtk3-icon-browser.vcxprojin
rename to build/win32/vs10/gtk4-icon-browser.vcxprojin
index f705ef7..4c254db 100644
--- a/build/win32/vs10/gtk3-icon-browser.vcxprojin
+++ b/build/win32/vs10/gtk4-icon-browser.vcxprojin
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{343333C4-D46C-4C97-A986-959CCA6F1DE0}</ProjectGuid>
- <RootNamespace>gtk3iconbrowser</RootNamespace>
+ <RootNamespace>gtk4iconbrowser</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -159,14 +159,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gtk3-icon-browser.vs10.sourcefiles"
+#include "gtk4-icon-browser.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/build/win32/vs10/gtk3-ignore-broadway.props b/build/win32/vs10/gtk4-ignore-broadway.props
similarity index 76%
rename from build/win32/vs10/gtk3-ignore-broadway.props
rename to build/win32/vs10/gtk4-ignore-broadway.props
index 0c97cf0..5b4c893 100644
--- a/build/win32/vs10/gtk3-ignore-broadway.props
+++ b/build/win32/vs10/gtk4-ignore-broadway.props
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3ignorebroadwayprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4ignorebroadwayprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>$(OutDir)\gdk3-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(OutDir)\gdk4-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk4-install.propsin
similarity index 67%
rename from build/win32/vs10/gtk3-install.propsin
rename to build/win32/vs10/gtk4-install.propsin
index 7221413..1b6d6c9 100644
--- a/build/win32/vs10/gtk3-install.propsin
+++ b/build/win32/vs10/gtk4-install.propsin
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtk3-build-defines.props" />
+ <Import Project="gtk4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
@@ -9,24 +9,22 @@
mkdir $(CopyDir)\bin
mkdir $(CopyDir)\lib\pkgconfig
-copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
-copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib
copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
-copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-demo.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-demo.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-demo-application.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-demo-application.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-icon-browser.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-icon-browser.pdb" $(CopyDir)\bin
copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin
@@ -44,18 +42,16 @@ copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
:DO_BROADWAY_RELEASE
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
@@ -68,18 +64,16 @@ copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
goto DONE_BIN
:DO_BROADWAY_DEBUG
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
@@ -91,37 +85,34 @@ copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
:DONE_BIN
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\gdk-4.0.pc $(CopyDir)\lib\pkgconfig
+copy "..\gtk+-4.0.pc" $(CopyDir)\lib\pkgconfig
+copy ..\gail-4.0.pc $(CopyDir)\lib\pkgconfig
</GtkDoInstallBin>
<GtkDoInstall>
echo off
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-#include "gdk-3.vs10.headers"
-#include "gdk3-win32.vs10.headers"
+#include "gdk-4.vs10.headers"
+#include "gdk4-win32.vs10.headers"
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-#include "gtk-3.vs10.headers"
-
-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
-#include "gailutil-3.vs10.headers"
+#include "gtk-4.vs10.headers"
mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
-copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
+copy ..\..\..\demos\gtk-demo\data\16x16\gtk4-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
-copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps
+copy ..\..\..\demos\gtk-demo\data\22x22\gtk4-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps
mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
-copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps
+copy ..\..\..\demos\gtk-demo\data\24x24\gtk4-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps
mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
-copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps
+copy ..\..\..\demos\gtk-demo\data\32x32\gtk4-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps
mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
-copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps
+copy ..\..\..\demos\gtk-demo\data\48x48\gtk4-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps
mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
-copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps
+copy ..\..\..\demos\gtk-demo\data\256x256\gtk4-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps
mkdir $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
@@ -131,7 +122,7 @@ copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\
<GtkDoInstallBroadwayHeaders>
copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
-#include "gdk3-broadway.vs10.headers"
+#include "gdk4-broadway.vs10.headers"
</GtkDoInstallBroadwayHeaders>
<GtkPostInstall>
echo "Compiling gsettings XML Files..."
@@ -142,10 +133,10 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir
</GtkPostInstall>
<GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion)
--host=i686-pc-vs$(VSVer)</GenerateGtkPC>
<GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion)
--host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
- <GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
+ <GtkPCFiles>..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc</GtkPCFiles>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4installsprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="BinDir">
diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk4-install.vcxproj
similarity index 95%
rename from build/win32/vs10/gtk3-install.vcxproj
rename to build/win32/vs10/gtk4-install.vcxproj
index 5ddf92a..70b89e2 100644
--- a/build/win32/vs10/gtk3-install.vcxproj
+++ b/build/win32/vs10/gtk4-install.vcxproj
@@ -36,7 +36,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}</ProjectGuid>
- <RootNamespace>gtkinstall</RootNamespace>
+ <RootNamespace>gtk4install</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,35 +89,35 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-install.props" />
+ <Import Project="gtk4-install.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -217,27 +217,23 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk-3.vcxproj">
+ <ProjectReference Include="gdk-4.vcxproj">
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk3-demo.vcxproj">
+ <ProjectReference Include="gtk4-demo.vcxproj">
<Project>{bdae6de2-6bcc-4107-94f0-da12214a02de}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk-3.vcxproj">
+ <ProjectReference Include="gtk-4.vcxproj">
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gailutil-3.vcxproj">
- <Project>{a1fced61-4e51-4015-a70c-5373404d1ba0}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="gtk3-demo-application.vcxproj">
+ <ProjectReference Include="gtk4-demo-application.vcxproj">
<Project>{be6b4973-c6ff-4c8f-8e97-a47793c50f44}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="gtk3-icon-browser.vcxproj">
+ <ProjectReference Include="gtk4-icon-browser.vcxproj">
<Project>{343333c4-d46c-4c97-a986-959cca6f1de0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
@@ -258,7 +254,7 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="gtk-query-settings.vcxproj">
- <Project>{9f22107a-3ef7-4b52-b269-747b65307f36}</Project>
+ <Project>{9f22107a-4ef7-4b52-b269-747b65307f36}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/build/win32/vs10/gtk3-install.vcxproj.filters b/build/win32/vs10/gtk4-install.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk3-install.vcxproj.filters
rename to build/win32/vs10/gtk4-install.vcxproj.filters
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/build/win32/vs10/gtk4-prebuild.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk3-prebuild.vcxproj
rename to build/win32/vs10/gtk4-prebuild.vcxproj
index 05e8131..d68bfe8 100644
--- a/build/win32/vs10/gtk3-prebuild.vcxproj
+++ b/build/win32/vs10/gtk4-prebuild.vcxproj
@@ -89,35 +89,35 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk3-gen-srcs.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj.filters b/build/win32/vs10/gtk4-prebuild.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk3-prebuild.vcxproj.filters
rename to build/win32/vs10/gtk4-prebuild.vcxproj.filters
diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk4-version-paths.props.in
similarity index 95%
rename from build/win32/vs10/gtk3-version-paths.props.in
rename to build/win32/vs10/gtk4-version-paths.props.in
index 8c3e3d6..fb74684 100644
--- a/build/win32/vs10/gtk3-version-paths.props.in
+++ b/build/win32/vs10/gtk4-version-paths.props.in
@@ -4,7 +4,7 @@
<VSVer>10</VSVer>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
- <ApiVersion>3.0</ApiVersion>
+ <ApiVersion>4.0</ApiVersion>
<GtkVersion>@GTK_VERSION@</GtkVersion>
<GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
<GtkLibtoolCompatibleDllSuffix>.0-0</GtkLibtoolCompatibleDllSuffix>
@@ -16,7 +16,7 @@
<PythonPathX64>$(PythonPath).x64</PythonPathX64>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtk3versionpathsprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtk4versionpathsprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="VSVer">
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 3ced683..893bf9f 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl
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+-4.sln \
+ gtk4-prebuild.vcxproj \
+ gtk4-prebuild.vcxproj.filters \
+ gdk4-win32.vcxproj \
+ gdk4-win32.vcxproj.filters \
+ gdk-4.vcxproj \
+ gdk-4.vcxproj.filters \
+ gtk-4.vcxproj \
+ gtk-4.vcxproj.filters \
gtk-builder-tool.vcxproj \
gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
@@ -19,26 +19,24 @@ EXTRA_DIST += \
gtk-update-icon-cache.vcxproj.filters \
gtk-query-settings.vcxproj \
gtk-query-settings.vcxproj.filters \
- gtk3-demo.vcxproj \
- gtk3-demo.vcxproj.filters \
- gtk3-demo-application.vcxproj \
- gtk3-demo-application.vcxproj.filters \
- gtk3-icon-browser.vcxproj \
- gtk3-icon-browser.vcxproj.filters \
- gailutil-3.vcxproj \
- gailutil-3.vcxproj.filters \
- gtk3-install.vcxproj \
- gtk3-install.vcxproj.filters \
+ gtk4-demo.vcxproj \
+ gtk4-demo.vcxproj.filters \
+ gtk4-demo-application.vcxproj \
+ gtk4-demo-application.vcxproj.filters \
+ gtk4-icon-browser.vcxproj \
+ gtk4-icon-browser.vcxproj.filters \
+ gtk4-install.vcxproj \
+ gtk4-install.vcxproj.filters \
broadwayd.vcxproj \
broadwayd.vcxproj.filters \
- gdk3-broadway.vcxproj \
- gdk3-broadway.vcxproj.filters \
- gtk3-build-defines.props \
- gtk3-copy-gdk-broadway.props \
- gtk3-gen-srcs.props \
- gtk3-ignore-broadway.props \
- gtk3-install.props \
- gtk3-version-paths.props
+ gdk4-broadway.vcxproj \
+ gdk4-broadway.vcxproj.filters \
+ gtk4-build-defines.props \
+ gtk4-copy-gdk-broadway.props \
+ gtk4-gen-srcs.props \
+ gtk4-ignore-broadway.props \
+ gtk4-install.props \
+ gtk4-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 766ccd6..1303214 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl
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+-4.sln \
+ gtk4-prebuild.vcxproj \
+ gtk4-prebuild.vcxproj.filters \
+ gdk4-win32.vcxproj \
+ gdk4-win32.vcxproj.filters \
+ gdk-4.vcxproj \
+ gdk-4.vcxproj.filters \
+ gtk-4.vcxproj \
+ gtk-4.vcxproj.filters \
gtk-builder-tool.vcxproj \
gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
@@ -19,26 +19,24 @@ EXTRA_DIST += \
gtk-query-settings.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk3-demo.vcxproj \
- gtk3-demo.vcxproj.filters \
- gtk3-demo-application.vcxproj \
- gtk3-demo-application.vcxproj.filters \
- gtk3-icon-browser.vcxproj \
- gtk3-icon-browser.vcxproj.filters \
- gailutil-3.vcxproj \
- gailutil-3.vcxproj.filters \
- gtk3-install.vcxproj \
- gtk3-install.vcxproj.filters \
+ gtk4-demo.vcxproj \
+ gtk4-demo.vcxproj.filters \
+ gtk4-demo-application.vcxproj \
+ gtk4-demo-application.vcxproj.filters \
+ gtk4-icon-browser.vcxproj \
+ gtk4-icon-browser.vcxproj.filters \
+ gtk4-install.vcxproj \
+ gtk4-install.vcxproj.filters \
broadwayd.vcxproj \
broadwayd.vcxproj.filters \
- gdk3-broadway.vcxproj \
- gdk3-broadway.vcxproj.filters \
- gtk3-build-defines.props \
- gtk3-copy-gdk-broadway.props \
- gtk3-gen-srcs.props \
- gtk3-ignore-broadway.props \
- gtk3-install.props \
- gtk3-version-paths.props
+ gdk4-broadway.vcxproj \
+ gdk4-broadway.vcxproj.filters \
+ gtk4-build-defines.props \
+ gtk4-copy-gdk-broadway.props \
+ gtk4-gen-srcs.props \
+ gtk4-ignore-broadway.props \
+ gtk4-install.props \
+ gtk4-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index dfa6c32..dc0625c 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl
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+-4.sln \
+ gtk4-prebuild.vcxproj \
+ gtk4-prebuild.vcxproj.filters \
+ gdk4-win32.vcxproj \
+ gdk4-win32.vcxproj.filters \
+ gdk-4.vcxproj \
+ gdk-4.vcxproj.filters \
+ gtk-4.vcxproj \
+ gtk-4.vcxproj.filters \
gtk-builder-tool.vcxproj \
gtk-builder-tool.vcxproj.filters \
gtk-encode-symbolic-svg.vcxproj \
@@ -19,26 +19,24 @@ EXTRA_DIST += \
gtk-query-settings.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk3-demo.vcxproj \
- gtk3-demo.vcxproj.filters \
- gtk3-demo-application.vcxproj \
- gtk3-demo-application.vcxproj.filters \
- gtk3-icon-browser.vcxproj \
- gtk3-icon-browser.vcxproj.filters \
- gailutil-3.vcxproj \
- gailutil-3.vcxproj.filters \
- gtk3-install.vcxproj \
- gtk3-install.vcxproj.filters \
+ gtk4-demo.vcxproj \
+ gtk4-demo.vcxproj.filters \
+ gtk4-demo-application.vcxproj \
+ gtk4-demo-application.vcxproj.filters \
+ gtk4-icon-browser.vcxproj \
+ gtk4-icon-browser.vcxproj.filters \
+ gtk4-install.vcxproj \
+ gtk4-install.vcxproj.filters \
broadwayd.vcxproj \
broadwayd.vcxproj.filters \
- gdk3-broadway.vcxproj \
- gdk3-broadway.vcxproj.filters \
- gtk3-build-defines.props \
- gtk3-copy-gdk-broadway.props \
- gtk3-gen-srcs.props \
- gtk3-ignore-broadway.props \
- gtk3-install.props \
- gtk3-version-paths.props
+ gdk4-broadway.vcxproj \
+ gdk4-broadway.vcxproj.filters \
+ gtk4-build-defines.props \
+ gtk4-copy-gdk-broadway.props \
+ gtk4-gen-srcs.props \
+ gtk4-ignore-broadway.props \
+ gtk4-install.props \
+ gtk4-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 4e31db7..d30a568 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,53 +1,50 @@
include $(top_srcdir)/Makefile.decl
MSVC_HEADERS_LISTS = \
- gdk3-win32.headers \
- gdk3-broadway.headers \
- gdk-3.headers \
- gtk-3.headers \
- gailutil-3.headers
+ gdk4-win32.headers \
+ gdk4-broadway.headers \
+ gdk-4.headers \
+ gtk-4.headers
GENERATED_ITEMS = \
- gdk3-win32.vcproj \
- gdk3-broadway.vcproj \
+ gdk4-win32.vcproj \
+ gdk4-broadway.vcproj \
broadwayd.vcproj \
- gdk-3.vcproj \
- gtk-3.vcproj \
- gtk3-demo.vcproj \
- gtk3-demo-application.vcproj \
- gtk3-icon-browser.vcproj \
- gailutil-3.vcproj \
- gtk3-install.vsprops \
- gtk3-version-paths.vsprops
+ gdk-4.vcproj \
+ gtk-4.vcproj \
+ gtk4-demo.vcproj \
+ gtk4-demo-application.vcproj \
+ gtk4-icon-browser.vcproj \
+ gtk4-install.vsprops \
+ gtk4-version-paths.vsprops
EXTRA_DIST += \
README.txt \
- gtk+.sln \
- gtk3-prebuild.vcproj \
- gdk3-win32.vcprojin \
- gdk-3.vcprojin \
- gtk-3.vcprojin \
+ gtk+-4.sln \
+ gtk4-prebuild.vcproj \
+ gdk4-win32.vcprojin \
+ gdk-4.vcprojin \
+ gtk-4.vcprojin \
gtk-builder-tool.vcproj \
gtk-encode-symbolic-svg.vcproj \
gtk-query-settings.vcproj \
gtk-update-icon-cache.vcproj \
- gtk3-demo.vcprojin \
- gtk3-demo-application.vcprojin \
- gtk3-icon-browser.vcprojin \
- gailutil-3.vcprojin \
- gtk3-install.vcproj \
+ gtk4-demo.vcprojin \
+ gtk4-demo-application.vcprojin \
+ gtk4-icon-browser.vcprojin \
+ gtk4-install.vcproj \
broadwayd.vcprojin \
- gdk3-broadway.vcprojin \
- gtk3-build-defines.vsprops \
- gtk3-copy-gdk-broadway.vsprops \
- gtk3-gen-srcs.vsprops \
- gtk3-ignore-broadway.vsprops \
- gtk3-install.vspropsin \
- gtk3-version-paths.vsprops.in \
+ gdk4-broadway.vcprojin \
+ gtk4-build-defines.vsprops \
+ gtk4-copy-gdk-broadway.vsprops \
+ gtk4-gen-srcs.vsprops \
+ gtk4-ignore-broadway.vsprops \
+ gtk4-install.vspropsin \
+ gtk4-version-paths.vsprops.in \
$(GENERATED_ITEMS)
-gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin >$@
+gtk4-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk4-install.vspropsin $(MSVC_HEADERS_LISTS)
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk4-install.vspropsin >$@
rm $(MSVC_HEADERS_LISTS)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/broadwayd.vcprojin b/build/win32/vs9/broadwayd.vcprojin
index e959a07..1984e48 100644
--- a/build/win32/vs9/broadwayd.vcprojin
+++ b/build/win32/vs9/broadwayd.vcprojin
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -51,7 +51,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -84,7 +84,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -115,7 +115,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gdk-3.vcprojin b/build/win32/vs9/gdk-4.vcprojin
similarity index 93%
rename from build/win32/vs9/gdk-3.vcprojin
rename to build/win32/vs9/gdk-4.vcprojin
index 5f228db..cf07ad6 100644
--- a/build/win32/vs9/gdk-3.vcprojin
+++ b/build/win32/vs9/gdk-4.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gdk-3"
+ Name="gdk-4"
ProjectGUID="{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
- RootNamespace="gdk3"
+ RootNamespace="gdk4"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-ignore-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -53,7 +53,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-copy-gdk-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -85,7 +85,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-ignore-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-copy-gdk-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -149,7 +149,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-ignore-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -181,7 +181,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|x64"
- InheritedPropertySheets=".\gtk3-copy-gdk-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -213,7 +213,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-ignore-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -245,7 +245,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|x64"
- InheritedPropertySheets=".\gtk3-copy-gdk-broadway.vsprops"
+ InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -297,7 +297,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gdk-3.sourcefiles"
+#include "gdk-4.sourcefiles"
<File RelativePath="..\..\..\gdk\gdkkeynames.c" />
</Filter>
</Files>
diff --git a/build/win32/vs9/gdk3-broadway.vcprojin b/build/win32/vs9/gdk4-broadway.vcprojin
similarity index 90%
rename from build/win32/vs9/gdk3-broadway.vcprojin
rename to build/win32/vs9/gdk4-broadway.vcprojin
index 4fb565f..1831705 100644
--- a/build/win32/vs9/gdk3-broadway.vcprojin
+++ b/build/win32/vs9/gdk4-broadway.vcprojin
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gdk3-broadway"
+ Name="gdk4-broadway"
ProjectGUID="{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
RootNamespace="gdk3broadway"
Keyword="Win32Proj"
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -43,7 +43,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -63,7 +63,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -85,7 +85,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -124,7 +124,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gdk3-broadway.sourcefiles"
+#include "gdk4-broadway.sourcefiles"
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/gdk3-win32.vcprojin b/build/win32/vs9/gdk4-win32.vcprojin
similarity index 90%
rename from build/win32/vs9/gdk3-win32.vcprojin
rename to build/win32/vs9/gdk4-win32.vcprojin
index fe26bd9..dace95b 100644
--- a/build/win32/vs9/gdk3-win32.vcprojin
+++ b/build/win32/vs9/gdk4-win32.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gdk3-win32"
+ Name="gdk4-win32"
ProjectGUID="{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
- RootNamespace="gdk3win32"
+ RootNamespace="gdk4win32"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -43,7 +43,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -63,7 +63,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
>
@@ -85,7 +85,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -124,7 +124,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gdk3-win32.sourcefiles"
+#include "gdk4-win32.sourcefiles"
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+-4.sln
similarity index 93%
rename from build/win32/vs9/gtk+.sln
rename to build/win32/vs9/gtk+-4.sln
index d13b815..436f583 100644
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+-4.sln
@@ -1,13 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcproj",
"{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebuild.vcproj",
"{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcproj",
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win42", "gdk4-win32.vcproj",
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
ProjectSection(ProjectDependencies) = postProject
{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcproj",
"{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-broadway", "gdk4-broadway.vcproj",
"{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
ProjectSection(ProjectDependencies) = postProject
{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}
EndProjectSection
@@ -17,24 +17,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcpr
{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcproj",
"{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-4", "gdk-4.vcproj",
"{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
ProjectSection(ProjectDependencies) = postProject
{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} = {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}
{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} = {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcproj",
"{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-4", "gtk-4.vcproj",
"{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
ProjectSection(ProjectDependencies) = postProject
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj",
"{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo", "gtk4-demo.vcproj",
"{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
ProjectSection(ProjectDependencies) = postProject
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcproj",
"{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo-application", "gtk4-demo-application.vcproj",
"{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
ProjectSection(ProjectDependencies) = postProject
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
@@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcproj",
"{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-icon-browser", "gtk4-icon-browser.vcproj",
"{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
ProjectSection(ProjectDependencies) = postProject
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
@@ -68,7 +68,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-q
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj",
"{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-install", "gtk4-install.vcproj",
"{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
ProjectSection(ProjectDependencies) = postProject
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-4.vcprojin
similarity index 93%
rename from build/win32/vs9/gtk-3.vcprojin
rename to build/win32/vs9/gtk-4.vcprojin
index 6263367..e387d6a 100644
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/build/win32/vs9/gtk-4.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk-3"
+ Name="gtk-4"
ProjectGUID="{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
- RootNamespace="gtk3"
+ RootNamespace="gtk4"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -53,7 +53,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -85,7 +85,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -117,7 +117,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -222,45 +222,45 @@
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\gtk\libgtk3.manifest.in">
+ <File RelativePath="..\..\..\gtk\libgtk4.manifest.in">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating GTK+ Win32 Manifest..."
CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
+ Outputs="..\..\..\gtk\libgtk4.manifest"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating GTK+ Win32 Manifest..."
CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
+ Outputs="..\..\..\gtk\libgtk4.manifest"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating GTK+ Win32 Manifest..."
CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
+ Outputs="..\..\..\gtk\libgtk4.manifest"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating GTK+ Win32 Manifest..."
CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
+ Outputs="..\..\..\gtk\libgtk4.manifest"
/>
</FileConfiguration>
</File>
<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
- <File RelativePath="..\..\..\gtk\libgtk3.manifest" />
+ <File RelativePath="..\..\..\gtk\libgtk4.manifest" />
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gtk-3.sourcefiles"
+#include "gtk-4.sourcefiles"
<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
diff --git a/build/win32/vs9/gtk-builder-tool.vcproj b/build/win32/vs9/gtk-builder-tool.vcproj
index 543f00f..e4c3127 100644
--- a/build/win32/vs9/gtk-builder-tool.vcproj
+++ b/build/win32/vs9/gtk-builder-tool.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj b/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
index 52b68b2..70c6849 100644
--- a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
+++ b/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -51,7 +51,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -84,7 +84,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -115,7 +115,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk-query-settings.vcproj b/build/win32/vs9/gtk-query-settings.vcproj
index a893c95..9e734a1 100644
--- a/build/win32/vs9/gtk-query-settings.vcproj
+++ b/build/win32/vs9/gtk-query-settings.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk-update-icon-cache.vcproj b/build/win32/vs9/gtk-update-icon-cache.vcproj
index 0b15f3a..1b1ff48 100644
--- a/build/win32/vs9/gtk-update-icon-cache.vcproj
+++ b/build/win32/vs9/gtk-update-icon-cache.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk3-build-defines.vsprops b/build/win32/vs9/gtk4-build-defines.vsprops
similarity index 96%
rename from build/win32/vs9/gtk3-build-defines.vsprops
rename to build/win32/vs9/gtk4-build-defines.vsprops
index 4bade71..a7f3381 100644
--- a/build/win32/vs9/gtk3-build-defines.vsprops
+++ b/build/win32/vs9/gtk4-build-defines.vsprops
@@ -2,10 +2,10 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk3builddefinesprops"
+ Name="gtk4builddefinesprops"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
- InheritedPropertySheets=".\gtk3-version-paths.vsprops"
+ InheritedPropertySheets=".\gtk4-version-paths.vsprops"
>
<Tool
Name="VCCLCompilerTool"
@@ -21,7 +21,7 @@
/>
<UserMacro
Name="GtkBinaryVersion"
- Value="3.0.0"
+ Value="4.0.0"
/>
<UserMacro
Name="GtkDummyPrefix"
diff --git a/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops b/build/win32/vs9/gtk4-copy-gdk-broadway.vsprops
similarity index 92%
rename from build/win32/vs9/gtk3-copy-gdk-broadway.vsprops
rename to build/win32/vs9/gtk4-copy-gdk-broadway.vsprops
index 048562b..81831a0 100644
--- a/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops
+++ b/build/win32/vs9/gtk4-copy-gdk-broadway.vsprops
@@ -2,8 +2,8 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk3copygdkbroadwayprops"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ Name="gtk4copygdkbroadwayprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
>
<Tool
Name="VCLinkerTool"
diff --git a/build/win32/vs9/gtk3-demo-application.vcprojin b/build/win32/vs9/gtk4-demo-application.vcprojin
similarity index 90%
rename from build/win32/vs9/gtk3-demo-application.vcprojin
rename to build/win32/vs9/gtk4-demo-application.vcprojin
index 2d8a85d..5b173d8 100644
--- a/build/win32/vs9/gtk3-demo-application.vcprojin
+++ b/build/win32/vs9/gtk4-demo-application.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk3-demo-application"
+ Name="gtk4-demo-application"
ProjectGUID="{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
- RootNamespace="gtk3demoapplication"
+ RootNamespace="gtk4demoapplication"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -109,7 +109,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -148,7 +148,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gtk3-demo-application.sourcefiles"
+#include "gtk4-demo-application.sourcefiles"
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk3-demo.vcprojin b/build/win32/vs9/gtk4-demo.vcprojin
similarity index 92%
rename from build/win32/vs9/gtk3-demo.vcprojin
rename to build/win32/vs9/gtk4-demo.vcprojin
index f8aef24..45baf16 100644
--- a/build/win32/vs9/gtk3-demo.vcprojin
+++ b/build/win32/vs9/gtk4-demo.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk3-demo"
+ Name="gtk4-demo"
ProjectGUID="{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
- RootNamespace="gtk3demo"
+ RootNamespace="gtk4demo"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -55,7 +55,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -121,7 +121,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -160,7 +160,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gtk3-demo.sourcefiles"
+#include "gtk4-demo.sourcefiles"
</Filter>
<Filter
Name="Header Files"
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk4-gen-srcs.vsprops
similarity index 93%
rename from build/win32/vs9/gtk3-gen-srcs.vsprops
rename to build/win32/vs9/gtk4-gen-srcs.vsprops
index c221fc4..1014e2e 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk4-gen-srcs.vsprops
@@ -2,8 +2,8 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk3gensrcsprops"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ Name="gtk4gensrcsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
>
<UserMacro
Name="GenConfigH"
@@ -72,7 +72,7 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)_Broadway
/>
<UserMacro
Name="GenerateGtkWin32Manifest"
- Value="$(PythonPath)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
+ Value="$(PythonPath)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk4.manifest.in --output=..\..\..\gtk\libgtk4.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
/>
<UserMacro
Name="CopyDemosH"
diff --git a/build/win32/vs9/gtk3-icon-browser.vcprojin b/build/win32/vs9/gtk4-icon-browser.vcprojin
similarity index 92%
rename from build/win32/vs9/gtk3-icon-browser.vcprojin
rename to build/win32/vs9/gtk4-icon-browser.vcprojin
index 08580b5..8f031ab 100644
--- a/build/win32/vs9/gtk3-icon-browser.vcprojin
+++ b/build/win32/vs9/gtk4-icon-browser.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk3-icon-browser"
+ Name="gtk4-icon-browser"
ProjectGUID="{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
- RootNamespace="gtk3iconbrowser"
+ RootNamespace="gtk4iconbrowser"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -51,7 +51,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -84,7 +84,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -115,7 +115,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -156,7 +156,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gtk3-icon-browser.sourcefiles"
+#include "gtk4-icon-browser.sourcefiles"
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk3-ignore-broadway.vsprops b/build/win32/vs9/gtk4-ignore-broadway.vsprops
similarity index 66%
rename from build/win32/vs9/gtk3-ignore-broadway.vsprops
rename to build/win32/vs9/gtk4-ignore-broadway.vsprops
index ee3bbb1..4205166 100644
--- a/build/win32/vs9/gtk3-ignore-broadway.vsprops
+++ b/build/win32/vs9/gtk4-ignore-broadway.vsprops
@@ -2,13 +2,13 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk3ignorebroadwayprops"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ Name="gtk4ignorebroadwayprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
>
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalDependencies="$(OutDir)\gdk3-win32.lib"
+ AdditionalDependencies="$(OutDir)\gdk4-win32.lib"
AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk3-install.vcproj b/build/win32/vs9/gtk4-install.vcproj
similarity index 84%
rename from build/win32/vs9/gtk3-install.vcproj
rename to build/win32/vs9/gtk4-install.vcproj
index be1e9c1..5dd4eab 100644
--- a/build/win32/vs9/gtk3-install.vcproj
+++ b/build/win32/vs9/gtk4-install.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk3-install"
+ Name="gtk4-install"
ProjectGUID="{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
- RootNamespace="gtk3install"
+ RootNamespace="gtk4install"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -23,7 +23,7 @@
Name="Debug|Win32"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -36,7 +36,7 @@
Name="Debug|x64"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -50,7 +50,7 @@
OutputDirectory="$(GlibEtcInstallRoot)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -63,7 +63,7 @@
Name="Debug_Broadway|x64"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -77,7 +77,7 @@
OutputDirectory="$(GlibEtcInstallRoot)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -91,7 +91,7 @@
Name="Release|x64"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -106,7 +106,7 @@
OutputDirectory="$(GlibEtcInstallRoot)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -120,7 +120,7 @@
Name="Release_Broadway|x64"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-install.vsprops"
+ InheritedPropertySheets=".\gtk4-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -144,56 +144,56 @@
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPC)"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPC)"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPCX64)"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPCX64)"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Debug_Broadway|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPC) --broadway"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release_Broadway|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPC) --broadway"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Debug_Broadway|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPCX64) --broadway"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release_Broadway|x64">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GenerateGtkPCX64) --broadway"
- Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
+ Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk4-install.vspropsin
similarity index 69%
rename from build/win32/vs9/gtk3-install.vspropsin
rename to build/win32/vs9/gtk4-install.vspropsin
index e665d13..afeedb1 100644
--- a/build/win32/vs9/gtk3-install.vspropsin
+++ b/build/win32/vs9/gtk4-install.vspropsin
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="gtkinstallprops"
- InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk4-build-defines.vsprops"
>
<UserMacro
Name="GtkDoInstallBin"
@@ -11,24 +11,22 @@
mkdir $(CopyDir)\bin

mkdir $(CopyDir)\lib\pkgconfig

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll
$(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).pdb
$(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib

if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_BIN

if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_BIN

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll
$(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb
$(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll
$(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb
$(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

@@ -46,18 +44,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.pdb $(CopyDir)\bin
if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_RELEASE

if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG

:DO_BROADWAY_RELEASE

-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin

copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

-copy .\Release\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin

+copy .\Release\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin

copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

@@ -69,18 +65,16 @@ copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
�
goto DONE_BIN

:DO_BROADWAY_DEBUG

-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin

copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

-copy .\Debug\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin

+copy .\Debug\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin

copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

@@ -91,9 +85,9 @@ copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

:DONE_BIN

-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig

-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig

-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig

+copy ..\gdk-4.0.pc $(CopyDir)\lib\pkgconfig

+copy "..\gtk+-4.0.pc" $(CopyDir)\lib\pkgconfig

+copy ..\gail-4.0.pc $(CopyDir)\lib\pkgconfig

"
/>
<UserMacro
@@ -104,28 +98,25 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated

copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-#include "gdk-3.headers"
-#include "gdk3-win32.headers"
+#include "gdk-4.headers"
+#include "gdk4-win32.headers"
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-#include "gtk-3.headers"
-
-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

-#include "gailutil-3.headers"
+#include "gtk-4.headers"
mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

-copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

+copy ..\..\..\demos\gtk-demo\data\16x16\gtk4-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

-copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

+copy ..\..\..\demos\gtk-demo\data\22x22\gtk4-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

-copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

+copy ..\..\..\demos\gtk-demo\data\24x24\gtk4-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

-copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

+copy ..\..\..\demos\gtk-demo\data\32x32\gtk4-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

-copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

+copy ..\..\..\demos\gtk-demo\data\48x48\gtk4-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

-copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png
$(CopyDir)\share\icons\hicolor\256x256\apps\

+copy ..\..\..\demos\gtk-demo\data\256x256\gtk4-demo.png
$(CopyDir)\share\icons\hicolor\256x256\apps\

mkdir $(CopyDir)\share\glib-2.0\schemas

copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

@@ -149,7 +140,7 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(Co
Value="
copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway

-#include "gdk3-broadway.headers"
+#include "gdk4-broadway.headers"
"
/>
<UserMacro
diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/build/win32/vs9/gtk4-prebuild.vcproj
similarity index 95%
rename from build/win32/vs9/gtk3-prebuild.vcproj
rename to build/win32/vs9/gtk4-prebuild.vcproj
index 58751b4..e496388 100644
--- a/build/win32/vs9/gtk3-prebuild.vcproj
+++ b/build/win32/vs9/gtk4-prebuild.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtk3-prebuild"
+ Name="gtk4-prebuild"
ProjectGUID="{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
- RootNamespace="gtk3prebuild"
+ RootNamespace="gtk4prebuild"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -30,7 +30,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -39,7 +39,7 @@
Name="Debug_Broadway|Win32"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -47,7 +47,7 @@
<Configuration
Name="Debug_Broadway|x64"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
@@ -56,7 +56,7 @@
Name="Release|Win32"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -65,7 +65,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -75,7 +75,7 @@
Name="Release_Broadway|Win32"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
@@ -84,7 +84,7 @@
<Configuration
Name="Release_Broadway|x64"
ConfigurationType="10"
- InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
diff --git a/build/win32/vs9/gtk3-version-paths.vsprops.in b/build/win32/vs9/gtk4-version-paths.vsprops.in
similarity index 96%
rename from build/win32/vs9/gtk3-version-paths.vsprops.in
rename to build/win32/vs9/gtk4-version-paths.vsprops.in
index 7d031c9..8837860 100644
--- a/build/win32/vs9/gtk3-version-paths.vsprops.in
+++ b/build/win32/vs9/gtk4-version-paths.vsprops.in
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtk3versionpathsprops"
+ Name="gtk4versionpathsprops"
>
<UserMacro
Name="VSVer"
@@ -18,7 +18,7 @@
/>
<UserMacro
Name="ApiVersion"
- Value="3.0"
+ Value="4.0"
/>
<UserMacro
Name="GtkVersion"
diff --git a/configure.ac b/configure.ac
index ad1dbc1..3d5cb6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1994,9 +1994,9 @@ docs/tools/Makefile
build/Makefile
build/win32/Makefile
build/win32/vs9/Makefile
-build/win32/vs9/gtk3-version-paths.vsprops
+build/win32/vs9/gtk4-version-paths.vsprops
build/win32/vs10/Makefile
-build/win32/vs10/gtk3-version-paths.props
+build/win32/vs10/gtk4-version-paths.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
build/win32/vs14/Makefile
@@ -2015,7 +2015,7 @@ gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
gtk/gtk-win32.rc.body
-gtk/libgtk3.manifest
+gtk/libgtk4.manifest
modules/Makefile
modules/input/Makefile
modules/printbackends/Makefile
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index a6d4648..f470fc8 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -197,7 +197,7 @@ include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
$(top_builddir)/build/win32/vs9/gtk4-demo.vcproj \
- $(top_builddir)/build/win42/vs9/gtk4-demo-application.vcproj
+ $(top_builddir)/build/win32/vs9/gtk4-demo-application.vcproj
DISTCLEANFILES = demos.h demos.h.win32
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 77b7319..d309089 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -547,8 +547,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
endif
dist-hook: \
- $(top_builddir)/build/win32/vs9/gdk-3.vcproj \
- $(top_builddir)/build/win32/vs9/gdk-3.headers \
+ $(top_builddir)/build/win32/vs9/gdk-4.vcproj \
+ $(top_builddir)/build/win32/vs9/gdk-4.headers \
$(INTROSPECTION_INTERMEDIATE_ITEMS)
DISTCLEANFILES = gdkconfig.h stamp-gc-h
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index ff793a7..3420865 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -108,15 +108,15 @@ EXTRA_DIST += $(broadway_built_sources)
BUILT_SOURCES = $(broadway_built_sources)
# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk3-broadway broadwayd
+MSVCPROJS = gdk4-broadway broadwayd
-gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES)
-gdk3_broadway_EXCLUDES = dummy
-gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
+gdk4_broadway_FILES = $(libgdk_broadway_la_SOURCES)
+gdk4_broadway_EXCLUDES = dummy
+gdk4_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
-gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
+gdk4_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
-gdk3_broadway_HEADERS_EXCLUDES = dummy
+gdk4_broadway_HEADERS_EXCLUDES = dummy
broadwayd_FILES = $(broadwayd_SOURCES)
broadwayd_EXCLUDES = dummy
@@ -124,8 +124,8 @@ broadwayd_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
- $(top_builddir)/build/win32/vs9/gdk3-broadway.vcproj \
+ $(top_builddir)/build/win32/vs9/gdk4-broadway.vcproj \
$(top_builddir)/build/win32/vs9/broadwayd.vcproj \
- $(top_builddir)/build/win32/vs9/gdk3-broadway.headers
+ $(top_builddir)/build/win32/vs9/gdk4-broadway.headers
-include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 8d73e22..2b89eea 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -88,20 +88,20 @@ libgdkwin32include_HEADERS = \
gdkwin32window.h
# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk3-win32
+MSVCPROJS = gdk4-win32
-gdk3_win32_FILES = $(libgdk_win32_la_SOURCES)
-gdk3_win32_EXCLUDES = dummy
-gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir)
+gdk4_win32_FILES = $(libgdk_win32_la_SOURCES)
+gdk4_win32_EXCLUDES = dummy
+gdk4_win32_HEADERS_DIR = $(libgdkwin32includedir)
-gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
+gdk4_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
-gdk3_win32_HEADERS_EXCLUDES = dummy
+gdk4_win32_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
- $(top_builddir)/build/win32/vs9/gdk3-win32.vcproj \
- $(top_builddir)/build/win32/vs9/gdk3-win32.headers
+ $(top_builddir)/build/win32/vs9/gdk4-win32.vcproj \
+ $(top_builddir)/build/win32/vs9/gdk4-win32.headers
-include $(top_srcdir)/git.mk
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 94f3103..8277b33 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -43,13 +43,13 @@ gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
gtk_win32_res = gtk-win32-res.o
gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
-gtk-win32-res.o : gtk-win32.rc libgtk3.manifest
+gtk-win32-res.o : gtk-win32.rc libgtk4.manifest
$(WINDRES) gtk-win32.rc $@
gtk-win32.rc: gtk-win32.rc.body
echo "#include <winuser.h>" >>$@
cat $< >>$@
- echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@
+ echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk4.manifest" >>$@
gtk.def: libgtk-4.la
echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
@@ -57,9 +57,9 @@ gtk.def: libgtk-4.la
objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
install-def-file: gtk.def
- $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
+ $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-4.0.def
uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
+ -rm $(DESTDIR)$(libdir)/gtk-win32-4.0.def
else
install-def-file:
uninstall-def-file:
@@ -68,7 +68,7 @@ endif
if MS_LIB_AVAILABLE
noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
-gtk-win32-$(GTK_API_VERSION).lib: libgtk-3.la gtk.def
+gtk-win32-$(GTK_API_VERSION).lib: libgtk-4.la gtk.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll
-def:gtk.def -out:$@
install-ms-lib:
@@ -1115,7 +1115,6 @@ gtk_extra_sources = \
paper_names.c \
paper_names_offsets.c \
gen-paper-names.c \
- deprecated/gtkstatusicon-quartz.c \
gtkversion.h.in \
gtkmarshalers.list \
fallback-c89.c
@@ -1411,7 +1410,7 @@ uninstall-mac-key-theme:
endif
# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk-3
+MSVCPROJS = gtk-4
gtk_4_FILES = \
$(gtk_base_c_sources) \
@@ -1459,7 +1458,7 @@ GTK_MSVC_GIR_CFLAGS = \
INTROSPECTION_INTERMEDIATE_ITEMS = \
$(top_builddir)/build/win32/Gtk-4.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/Gtk-4_0_gir_list
+ $(top_builddir)/build/win32/Gtk_4_0_gir_list
Gtk_4_0_gir_MSVC_FILES = \
$(introspected_pub_headers) \
@@ -1482,8 +1481,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
endif
dist-hook: \
- $(top_builddir)/build/win32/vs9/gtk-3.vcproj \
- $(top_builddir)/build/win32/vs9/gtk-3.headers \
+ $(top_builddir)/build/win32/vs9/gtk-4.vcproj \
+ $(top_builddir)/build/win32/vs9/gtk-4.headers \
$(INTROSPECTION_INTERMEDIATE_ITEMS)
# Install a RC file for the default GTK+ theme, and key themes
@@ -1660,7 +1659,7 @@ EXTRA_DIST += \
a11y/Makefile.inc \
deprecated/Makefile.inc \
inspector/Makefile.inc \
- libgtk3.manifest.in \
+ libgtk4.manifest.in \
gtk-win32.rc.body.in \
gtk-win32.rc.body \
gtkprint-win32.h \
diff --git a/gtk/libgtk3.manifest.in b/gtk/libgtk4.manifest.in
similarity index 100%
rename from gtk/libgtk3.manifest.in
rename to gtk/libgtk4.manifest.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
