From 8b8f378050c1baef1b25448ff95d1b1171cb8401 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 19 Oct 2016 18:39:36 +0800 Subject: [PATCH] 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 ------------------ ...proj.filtersin => gdk-4.vcxproj.filtersin} | 2 +- .../vs10/{gdk-3.vcxprojin => gdk-4.vcxprojin} | 24 +-- ...tersin => gdk4-broadway.vcxproj.filtersin} | 2 +- ...dway.vcxprojin => gdk4-broadway.vcxprojin} | 14 +- ...filtersin => gdk4-win32.vcxproj.filtersin} | 2 +- ...3-win32.vcxprojin => gdk4-win32.vcxprojin} | 14 +- build/win32/vs10/{gtk+.sln => gtk+-4.sln} | 18 +- ...proj.filtersin => gtk-4.vcxproj.filtersin} | 6 +- .../vs10/{gtk-3.vcxprojin => gtk-4.vcxprojin} | 26 +-- build/win32/vs10/gtk-builder-tool.vcxproj | 12 +- .../vs10/gtk-encode-symbolic-svg.vcxproj | 10 +- build/win32/vs10/gtk-query-settings.vcxproj | 12 +- .../win32/vs10/gtk-update-icon-cache.vcxproj | 10 +- .../gtk3-demo-application.vcxproj.filtersin | 20 -- ...defines.props => gtk4-build-defines.props} | 6 +- ...way.props => gtk4-copy-gdk-broadway.props} | 4 +- ...> gtk4-demo-application.vcxproj.filtersin} | 2 +- ...projin => gtk4-demo-application.vcxprojin} | 16 +- ....filtersin => gtk4-demo.vcxproj.filtersin} | 2 +- ...tk3-demo.vcxprojin => gtk4-demo.vcxprojin} | 16 +- ...tk3-gen-srcs.props => gtk4-gen-srcs.props} | 8 +- ...in => gtk4-icon-browser.vcxproj.filtersin} | 2 +- ....vcxprojin => gtk4-icon-browser.vcxprojin} | 16 +- ...adway.props => gtk4-ignore-broadway.props} | 6 +- ...3-install.propsin => gtk4-install.propsin} | 93 ++++----- ...3-install.vcxproj => gtk4-install.vcxproj} | 34 ++-- ...j.filters => gtk4-install.vcxproj.filters} | 0 ...prebuild.vcxproj => gtk4-prebuild.vcxproj} | 16 +- ....filters => gtk4-prebuild.vcxproj.filters} | 0 ...s.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 ----------------- .../vs9/{gdk-3.vcprojin => gdk-4.vcprojin} | 22 +- ...oadway.vcprojin => gdk4-broadway.vcprojin} | 12 +- ...dk3-win32.vcprojin => gdk4-win32.vcprojin} | 14 +- build/win32/vs9/{gtk+.sln => gtk+-4.sln} | 18 +- .../vs9/{gtk-3.vcprojin => gtk-4.vcprojin} | 26 +-- build/win32/vs9/gtk-builder-tool.vcproj | 8 +- .../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 +- ...nes.vsprops => gtk4-build-defines.vsprops} | 6 +- ...vsprops => gtk4-copy-gdk-broadway.vsprops} | 4 +- ...cprojin => gtk4-demo-application.vcprojin} | 14 +- ...{gtk3-demo.vcprojin => gtk4-demo.vcprojin} | 14 +- ...gen-srcs.vsprops => gtk4-gen-srcs.vsprops} | 6 +- ...er.vcprojin => gtk4-icon-browser.vcprojin} | 14 +- ...y.vsprops => gtk4-ignore-broadway.vsprops} | 6 +- ...tk3-install.vcproj => gtk4-install.vcproj} | 36 ++-- ...stall.vspropsin => gtk4-install.vspropsin} | 89 ++++----- ...3-prebuild.vcproj => gtk4-prebuild.vcproj} | 20 +- ...props.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 +- ...ibgtk3.manifest.in => libgtk4.manifest.in} | 0 69 files changed, 555 insertions(+), 991 deletions(-) delete mode 100644 build/win32/vs10/gailutil-3.vcxprojin rename build/win32/vs10/{gdk-3.vcxproj.filtersin => gdk-4.vcxproj.filtersin} (96%) rename build/win32/vs10/{gdk-3.vcxprojin => gdk-4.vcxprojin} (96%) rename build/win32/vs10/{gdk3-broadway.vcxproj.filtersin => gdk4-broadway.vcxproj.filtersin} (94%) rename build/win32/vs10/{gdk3-broadway.vcxprojin => gdk4-broadway.vcxprojin} (95%) rename build/win32/vs10/{gdk3-win32.vcxproj.filtersin => gdk4-win32.vcxproj.filtersin} (94%) rename build/win32/vs10/{gdk3-win32.vcxprojin => gdk4-win32.vcxprojin} (95%) rename build/win32/vs10/{gtk+.sln => gtk+-4.sln} (93%) rename build/win32/vs10/{gtk-3.vcxproj.filtersin => gtk-4.vcxproj.filtersin} (94%) rename build/win32/vs10/{gtk-3.vcxprojin => gtk-4.vcxprojin} (95%) delete mode 100644 build/win32/vs10/gtk3-demo-application.vcxproj.filtersin rename build/win32/vs10/{gtk3-build-defines.props => gtk4-build-defines.props} (96%) rename build/win32/vs10/{gtk3-copy-gdk-broadway.props => gtk4-copy-gdk-broadway.props} (91%) rename build/win32/vs10/{gtk3-icon-browser.vcxproj.filtersin => gtk4-demo-application.vcxproj.filtersin} (93%) rename build/win32/vs10/{gtk3-demo-application.vcxprojin => gtk4-demo-application.vcxprojin} (95%) rename build/win32/vs10/{gtk3-demo.vcxproj.filtersin => gtk4-demo.vcxproj.filtersin} (92%) rename build/win32/vs10/{gtk3-demo.vcxprojin => gtk4-demo.vcxprojin} (96%) rename build/win32/vs10/{gtk3-gen-srcs.props => gtk4-gen-srcs.props} (93%) rename build/win32/vs10/{gailutil-3.vcxproj.filtersin => gtk4-icon-browser.vcxproj.filtersin} (93%) rename build/win32/vs10/{gtk3-icon-browser.vcxprojin => gtk4-icon-browser.vcxprojin} (95%) rename build/win32/vs10/{gtk3-ignore-broadway.props => gtk4-ignore-broadway.props} (76%) rename build/win32/vs10/{gtk3-install.propsin => gtk4-install.propsin} (67%) rename build/win32/vs10/{gtk3-install.vcxproj => gtk4-install.vcxproj} (95%) rename build/win32/vs10/{gtk3-install.vcxproj.filters => gtk4-install.vcxproj.filters} (100%) rename build/win32/vs10/{gtk3-prebuild.vcxproj => gtk4-prebuild.vcxproj} (98%) rename build/win32/vs10/{gtk3-prebuild.vcxproj.filters => gtk4-prebuild.vcxproj.filters} (100%) rename build/win32/vs10/{gtk3-version-paths.props.in => gtk4-version-paths.props.in} (95%) delete mode 100644 build/win32/vs9/gailutil-3.vcprojin rename build/win32/vs9/{gdk-3.vcprojin => gdk-4.vcprojin} (93%) rename build/win32/vs9/{gdk3-broadway.vcprojin => gdk4-broadway.vcprojin} (90%) rename build/win32/vs9/{gdk3-win32.vcprojin => gdk4-win32.vcprojin} (90%) rename build/win32/vs9/{gtk+.sln => gtk+-4.sln} (93%) rename build/win32/vs9/{gtk-3.vcprojin => gtk-4.vcprojin} (93%) rename build/win32/vs9/{gtk3-build-defines.vsprops => gtk4-build-defines.vsprops} (96%) rename build/win32/vs9/{gtk3-copy-gdk-broadway.vsprops => gtk4-copy-gdk-broadway.vsprops} (92%) rename build/win32/vs9/{gtk3-demo-application.vcprojin => gtk4-demo-application.vcprojin} (90%) rename build/win32/vs9/{gtk3-demo.vcprojin => gtk4-demo.vcprojin} (92%) rename build/win32/vs9/{gtk3-gen-srcs.vsprops => gtk4-gen-srcs.vsprops} (93%) rename build/win32/vs9/{gtk3-icon-browser.vcprojin => gtk4-icon-browser.vcprojin} (92%) rename build/win32/vs9/{gtk3-ignore-broadway.vsprops => gtk4-ignore-broadway.vsprops} (66%) rename build/win32/vs9/{gtk3-install.vcproj => gtk4-install.vcproj} (84%) rename build/win32/vs9/{gtk3-install.vspropsin => gtk4-install.vspropsin} (69%) rename build/win32/vs9/{gtk3-prebuild.vcproj => gtk4-prebuild.vcproj} (95%) rename build/win32/vs9/{gtk3-version-paths.vsprops.in => gtk4-version-paths.vsprops.in} (96%) rename gtk/{libgtk3.manifest.in => libgtk4.manifest.in} (100%) diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index e1253dab6b..60f01af68f 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 2149650a52..c8617d5e86 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 97a33c08b0..4daff56ac4 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 5358f969fb..9b986663a0 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 163e9c5fa0..14c575938f 100644 --- a/build/win32/vs10/broadwayd.vcxprojin +++ b/build/win32/vs10/broadwayd.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,7 +166,7 @@ #include "broadwayd.vs10.sourcefiles" - + {b98fbe68-b03c-48e3-8f32-c3c010720d30} false diff --git a/build/win32/vs10/gailutil-3.vcxprojin b/build/win32/vs10/gailutil-3.vcxprojin deleted file mode 100644 index 9652cedadc..0000000000 --- a/build/win32/vs10/gailutil-3.vcxprojin +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A1FCED61-4E51-4015-A70C-5373404D1BA0} - gailutil - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX86 - - - - - MaxSpeed - true - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - - - - - Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - - - - - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - atk-1.0.lib;%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 - - - -#include "gailutil-3.vs10.sourcefiles" - - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} - false - - - - - - 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 b618b922d4..6f24d8c623 100644 --- a/build/win32/vs10/gdk-3.vcxproj.filtersin +++ b/build/win32/vs10/gdk-4.vcxproj.filtersin @@ -18,7 +18,7 @@ Resource Files -#include "gdk-3.vs10.sourcefiles.filters" +#include "gdk-4.vs10.sourcefiles.filters" Source Files 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 1de4b9a4a7..109e3877ad 100644 --- a/build/win32/vs10/gdk-3.vcxprojin +++ b/build/win32/vs10/gdk-4.vcxprojin @@ -36,7 +36,7 @@ {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} - gdk3 + gdk4 Win32Proj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + @@ -314,15 +314,15 @@ -#include "gdk-3.vs10.sourcefiles" +#include "gdk-4.vs10.sourcefiles" - + {1df4c475-4472-4ee4-ac2b-3ab5a4c1a453} false - + {aba7685a-7cbb-4626-b5e5-6eeea5b489ef} false 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 539d51140b..8e7eae14dd 100644 --- a/build/win32/vs10/gdk3-broadway.vcxproj.filtersin +++ b/build/win32/vs10/gdk4-broadway.vcxproj.filtersin @@ -15,6 +15,6 @@ -#include "gdk3-broadway.vs10.sourcefiles.filters" +#include "gdk4-broadway.vs10.sourcefiles.filters" 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 d14fe37ace..c88e5c6ac2 100644 --- a/build/win32/vs10/gdk3-broadway.vcxprojin +++ b/build/win32/vs10/gdk4-broadway.vcxprojin @@ -20,7 +20,7 @@ {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} - gdkbroadway + gdk4broadway Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -117,10 +117,10 @@ -#include "gdk3-broadway.vs10.sourcefiles" +#include "gdk4-broadway.vs10.sourcefiles" - + {b98fbe68-b03c-48e3-8f32-c3c010720d30} false 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 f81bd0585d..36ba1caa08 100644 --- a/build/win32/vs10/gdk3-win32.vcxproj.filtersin +++ b/build/win32/vs10/gdk4-win32.vcxproj.filtersin @@ -15,6 +15,6 @@ -#include "gdk3-win32.vs10.sourcefiles.filters" +#include "gdk4-win32.vs10.sourcefiles.filters" 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 c5f4d48623..003088307a 100644 --- a/build/win32/vs10/gdk3-win32.vcxprojin +++ b/build/win32/vs10/gdk4-win32.vcxprojin @@ -20,7 +20,7 @@ {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} - gdkwin32 + gdk4win32 Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -117,10 +117,10 @@ -#include "gdk3-win32.vs10.sourcefiles" +#include "gdk4-win32.vs10.sourcefiles" - + {b98fbe68-b03c-48e3-8f32-c3c010720d30} false 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 5056ecd464..7b784d1366 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 319d20ab01..33162a27eb 100644 --- a/build/win32/vs10/gtk-3.vcxproj.filtersin +++ b/build/win32/vs10/gtk-4.vcxproj.filtersin @@ -20,10 +20,10 @@ Resource Files Resource Files - Resource Files + Resource Files -#include "gtk-3.vs10.sourcefiles.filters" +#include "gtk-4.vs10.sourcefiles.filters" Source Files Source Files Source Files @@ -41,6 +41,6 @@ Source Files - Resource Files + Resource Files 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 b6b104cc62..86b98b5125 100644 --- a/build/win32/vs10/gtk-3.vcxprojin +++ b/build/win32/vs10/gtk-4.vcxprojin @@ -22,7 +22,7 @@ {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} - gtk3 + gtk4 Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -191,26 +191,26 @@ $(CopyGtkWin32RC) ..\..\..\gtk\gtk-win32.rc;%(Outputs) - + Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk3.manifest;%(Outputs) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk3.manifest;%(Outputs) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk3.manifest;%(Outputs) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk3.manifest;%(Outputs) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) -#include "gtk-3.vs10.sourcefiles" +#include "gtk-4.vs10.sourcefiles" @@ -228,10 +228,10 @@ - + - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/build/win32/vs10/gtk-builder-tool.vcxproj index 1730019df3..e5771d2f61 100644 --- a/build/win32/vs10/gtk-builder-tool.vcxproj +++ b/build/win32/vs10/gtk-builder-tool.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,11 +166,11 @@ - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj index 4d9858a3fa..b910be53ff 100644 --- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,7 +166,7 @@ - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/build/win32/vs10/gtk-query-settings.vcxproj index 3c84329295..8dd75d7cb5 100644 --- a/build/win32/vs10/gtk-query-settings.vcxproj +++ b/build/win32/vs10/gtk-query-settings.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,11 +166,11 @@ - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/build/win32/vs10/gtk-update-icon-cache.vcxproj index 7b795afb2d..505b3fe721 100644 --- a/build/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/build/win32/vs10/gtk-update-icon-cache.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,7 +166,7 @@ - + {b98fbe68-b03c-48e3-8f32-c3c010720d30} false diff --git a/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin deleted file mode 100644 index 5b356ef76b..0000000000 --- a/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "gtk3-demo-application.vs10.sourcefiles.filters" - - 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 d695642cb4..f618190fa4 100644 --- a/build/win32/vs10/gtk3-build-defines.props +++ b/build/win32/vs10/gtk4-build-defines.props @@ -1,10 +1,10 @@ - + - 3.0.0 + 4.0.0 /dummy GTK_PREFIX=\"$(GtkDummyPrefix)\" GDK_COMPILATION;G_LOG_DOMAIN="Gdk" @@ -16,7 +16,7 @@ atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs) - <_PropertySheetDisplayName>gtk3builddefinesprops + <_PropertySheetDisplayName>gtk4builddefinesprops $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ 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 227b0da90b..4901b2ff9a 100644 --- a/build/win32/vs10/gtk3-copy-gdk-broadway.props +++ b/build/win32/vs10/gtk4-copy-gdk-broadway.props @@ -1,10 +1,10 @@  - + - <_PropertySheetDisplayName>gtk3copygdkbroadwayprops + <_PropertySheetDisplayName>gtk4copygdkbroadwayprops 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 2063a07e95..463134383f 100644 --- a/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin +++ b/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin @@ -15,6 +15,6 @@ -#include "gtk3-icon-browser.vs10.sourcefiles.filters" +#include "gtk4-demo-application.vs10.sourcefiles.filters" 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 6ff02c81bc..7bd290b542 100644 --- a/build/win32/vs10/gtk3-demo-application.vcxprojin +++ b/build/win32/vs10/gtk4-demo-application.vcxprojin @@ -20,7 +20,7 @@ {BE6B4973-C6FF-4C8F-8E97-A47793C50F44} - gtk3demoapplication + gtk4demoapplication Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -155,14 +155,14 @@ -#include "gtk3-demo-application.vs10.sourcefiles" +#include "gtk4-demo-application.vs10.sourcefiles" - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false 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 a8fa97ddc6..7ffdcf679b 100644 --- a/build/win32/vs10/gtk3-demo.vcxproj.filtersin +++ b/build/win32/vs10/gtk4-demo.vcxproj.filtersin @@ -11,6 +11,6 @@ -#include "gtk3-demo.vs10.sourcefiles.filters" +#include "gtk4-demo.vs10.sourcefiles.filters" 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 0abda49169..31df52cd5b 100644 --- a/build/win32/vs10/gtk3-demo.vcxprojin +++ b/build/win32/vs10/gtk4-demo.vcxprojin @@ -20,7 +20,7 @@ {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE} - gtk3demo + gtk4demo Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -169,14 +169,14 @@ -#include "gtk3-demo.vs10.sourcefiles" +#include "gtk4-demo.vs10.sourcefiles" - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false 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 e5e9c021b9..53555c3dfb 100644 --- a/build/win32/vs10/gtk3-gen-srcs.props +++ b/build/win32/vs10/gtk4-gen-srcs.props @@ -1,7 +1,7 @@  - + - + copy ..\..\..\config.h.win32 ..\..\..\config.h @@ -42,11 +42,11 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc - $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* + $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk4.manifest.in --output=..\..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h - <_PropertySheetDisplayName>gtk3gensrcsprops + <_PropertySheetDisplayName>gtk4gensrcsprops 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 5f3a5bcad4..4ff5822911 100644 --- a/build/win32/vs10/gailutil-3.vcxproj.filtersin +++ b/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin @@ -15,6 +15,6 @@ -#include "gailutil-3.vs10.sourcefiles.filters" +#include "gtk4-icon-browser.vs10.sourcefiles.filters" 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 f705ef7e82..4c254db7a3 100644 --- a/build/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/build/win32/vs10/gtk4-icon-browser.vcxprojin @@ -20,7 +20,7 @@ {343333C4-D46C-4C97-A986-959CCA6F1DE0} - gtk3iconbrowser + gtk4iconbrowser Win32Proj @@ -51,19 +51,19 @@ - + - + - + - + @@ -159,14 +159,14 @@ -#include "gtk3-icon-browser.vs10.sourcefiles" +#include "gtk4-icon-browser.vs10.sourcefiles" - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false 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 0c97cf0de9..5b4c893fa5 100644 --- a/build/win32/vs10/gtk3-ignore-broadway.props +++ b/build/win32/vs10/gtk4-ignore-broadway.props @@ -1,17 +1,17 @@  - + - <_PropertySheetDisplayName>gtk3ignorebroadwayprops + <_PropertySheetDisplayName>gtk4ignorebroadwayprops false - $(OutDir)\gdk3-win32.lib;%(AdditionalDependencies) + $(OutDir)\gdk4-win32.lib;%(AdditionalDependencies) /EXPORT:gdk_win32_display_manager_get_type 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 7221413c6f..1b6d6c9237 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk4-install.propsin @@ -1,7 +1,7 @@ - + $(SolutionDir)$(Configuration)\$(Platform)\bin @@ -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 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\ 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" echo "Compiling gsettings XML Files..." @@ -142,10 +133,10 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) $(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) - ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc + ..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc - <_PropertySheetDisplayName>gtk3installsprops + <_PropertySheetDisplayName>gtk4installsprops 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 5ddf92a151..70b89e2c62 100644 --- a/build/win32/vs10/gtk3-install.vcxproj +++ b/build/win32/vs10/gtk4-install.vcxproj @@ -36,7 +36,7 @@ {23BBF35F-78AF-4E8C-983F-7B90448CD7DF} - gtkinstall + gtk4install Win32Proj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + @@ -217,27 +217,23 @@ - + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false - + {bdae6de2-6bcc-4107-94f0-da12214a02de} false - + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false - - {a1fced61-4e51-4015-a70c-5373404d1ba0} - false - - + {be6b4973-c6ff-4c8f-8e97-a47793c50f44} false - + {343333c4-d46c-4c97-a986-959cca6f1de0} false @@ -258,7 +254,7 @@ false - {9f22107a-3ef7-4b52-b269-747b65307f36} + {9f22107a-4ef7-4b52-b269-747b65307f36} false 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 05e8131f3f..d68bfe83d6 100644 --- a/build/win32/vs10/gtk3-prebuild.vcxproj +++ b/build/win32/vs10/gtk4-prebuild.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + 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 8c3e3d6585..fb74684c83 100644 --- a/build/win32/vs10/gtk3-version-paths.props.in +++ b/build/win32/vs10/gtk4-version-paths.props.in @@ -4,7 +4,7 @@ 10 $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) ..\..\..\..\vs$(VSVer)\$(Platform) - 3.0 + 4.0 @GTK_VERSION@ lib .0-0 @@ -16,7 +16,7 @@ $(PythonPath).x64 - <_PropertySheetDisplayName>gtk3versionpathsprops + <_PropertySheetDisplayName>gtk4versionpathsprops diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 3ced683539..893bf9f8df 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 766ccd69f5..130321417c 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 dfa6c328e2..dc0625cf1d 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 4e31db7b9f..d30a568114 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 e959a07586..1984e48baf 100644 --- a/build/win32/vs9/broadwayd.vcprojin +++ b/build/win32/vs9/broadwayd.vcprojin @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gailutil-3.sourcefiles" - - - - - - - - - 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 5f228db34e..cf07ad6677 100644 --- a/build/win32/vs9/gdk-3.vcprojin +++ b/build/win32/vs9/gdk-4.vcprojin @@ -2,9 +2,9 @@ @@ -21,7 +21,7 @@ @@ -53,7 +53,7 @@ @@ -85,7 +85,7 @@ @@ -181,7 +181,7 @@ @@ -213,7 +213,7 @@ -#include "gdk-3.sourcefiles" +#include "gdk-4.sourcefiles" 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 4fb565fd1b..1831705929 100644 --- a/build/win32/vs9/gdk3-broadway.vcprojin +++ b/build/win32/vs9/gdk4-broadway.vcprojin @@ -2,7 +2,7 @@ @@ -43,7 +43,7 @@ @@ -85,7 +85,7 @@ -#include "gdk3-broadway.sourcefiles" +#include "gdk4-broadway.sourcefiles" 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 fe26bd9117..dace95b0c3 100644 --- a/build/win32/vs9/gdk3-win32.vcprojin +++ b/build/win32/vs9/gdk4-win32.vcprojin @@ -2,9 +2,9 @@ @@ -21,7 +21,7 @@ @@ -43,7 +43,7 @@ @@ -85,7 +85,7 @@ -#include "gdk3-win32.sourcefiles" +#include "gdk4-win32.sourcefiles" 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 d13b8150ad..436f583ac8 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 62633677a4..e387d6a086 100644 --- a/build/win32/vs9/gtk-3.vcprojin +++ b/build/win32/vs9/gtk-4.vcprojin @@ -2,9 +2,9 @@ @@ -21,7 +21,7 @@ @@ -53,7 +53,7 @@ @@ -117,7 +117,7 @@ - + - + -#include "gtk-3.sourcefiles" +#include "gtk-4.sourcefiles" diff --git a/build/win32/vs9/gtk-builder-tool.vcproj b/build/win32/vs9/gtk-builder-tool.vcproj index 543f00ff25..e4c3127c15 100644 --- a/build/win32/vs9/gtk-builder-tool.vcproj +++ b/build/win32/vs9/gtk-builder-tool.vcproj @@ -21,7 +21,7 @@ @@ -49,7 +49,7 @@ @@ -111,7 +111,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ @@ -49,7 +49,7 @@ @@ -111,7 +111,7 @@ @@ -49,7 +49,7 @@ @@ -111,7 +111,7 @@ @@ -21,7 +21,7 @@ @@ -49,7 +49,7 @@ @@ -109,7 +109,7 @@ -#include "gtk3-demo-application.sourcefiles" +#include "gtk4-demo-application.sourcefiles" @@ -22,7 +22,7 @@ @@ -121,7 +121,7 @@ @@ -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" @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ -#include "gtk3-icon-browser.sourcefiles" +#include "gtk4-icon-browser.sourcefiles" 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 be1e9c125b..5dd4eabe6f 100644 --- a/build/win32/vs9/gtk3-install.vcproj +++ b/build/win32/vs9/gtk4-install.vcproj @@ -2,9 +2,9 @@ @@ -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 @@ 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 e665d1342c..afeedb1929 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" > @@ -22,7 +22,7 @@ @@ -30,7 +30,7 @@ @@ -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 @@ @@ -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 @@ " >>$@ 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