From 4c2cd5910f276a048b940efb1421090a3312399a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 17 May 2022 12:33:22 +0800 Subject: [PATCH] Visual Studio projects: Make property sheets shared ...for Visual Studio 2010 and later, since we used to copy them and merely update the value of $(VSVer) during 'make dist' as needed. Instead of doing that, move the property sheets for Visual Studio 2010, which is the base version that we use, into a directory of its own, and make the Visual Studio 2010~2022 projects look for them in that directory, and set VSVer according to the toolset version identified by each of the project files. The ARM64-specific property sheet needed for VS2017 and the VS2008 property sheets will remain as they are. --- configure.ac | 3 ++- win32/Makefile-newvs.am | 7 ------- win32/Makefile.am | 3 ++- win32/vs10/Makefile.am | 5 +---- win32/vs10/broadwayd.vcxprojin | 8 ++++---- win32/vs10/gailutil-3.vcxprojin | 8 ++++---- win32/vs10/gdk-3.vcxprojin | 16 ++++++++-------- win32/vs10/gdk3-broadway.vcxprojin | 8 ++++---- win32/vs10/gdk3-win32.vcxprojin | 8 ++++---- win32/vs10/gtk-3.vcxprojin | 8 ++++---- win32/vs10/gtk-builder-tool.vcxproj | 8 ++++---- win32/vs10/gtk-encode-symbolic-svg.vcxproj | 8 ++++---- win32/vs10/gtk-query-settings.vcxproj | 8 ++++---- win32/vs10/gtk-update-icon-cache.vcxproj | 8 ++++---- win32/vs10/gtk3-demo-application.vcxprojin | 8 ++++---- win32/vs10/gtk3-demo.vcxprojin | 8 ++++---- win32/vs10/gtk3-icon-browser.vcxprojin | 8 ++++---- win32/vs10/gtk3-install.vcxproj | 16 ++++++++-------- win32/vs10/gtk3-introspect.vcxproj | 8 ++++---- win32/vs10/gtk3-prebuild.vcxproj | 16 ++++++++-------- win32/vs11/Makefile.am | 4 +--- win32/vs12/Makefile.am | 4 +--- win32/vs14/Makefile.am | 4 +--- win32/vs15/Makefile.am | 4 +--- win32/vs16/Makefile.am | 4 +--- win32/vs17/Makefile.am | 4 +--- win32/vs1x-props/Makefile.am | 13 +++++++++++++ .../gtk3-build-defines.props | 0 .../gtk3-version-paths.props.in | 9 ++++++++- 29 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 win32/vs1x-props/Makefile.am rename win32/{vs10 => vs1x-props}/gtk3-build-defines.props (100%) rename win32/{vs10 => vs1x-props}/gtk3-version-paths.props.in (87%) diff --git a/configure.ac b/configure.ac index e9ded998fc..a665921783 100644 --- a/configure.ac +++ b/configure.ac @@ -1963,13 +1963,14 @@ win32/config-msvc.mak win32/vs9/Makefile win32/vs9/gtk3-version-paths.vsprops win32/vs10/Makefile -win32/vs10/gtk3-version-paths.props win32/vs11/Makefile win32/vs12/Makefile win32/vs14/Makefile win32/vs15/Makefile win32/vs16/Makefile win32/vs17/Makefile +win32/vs1x-props/Makefile +win32/vs1x-props/gtk3-version-paths.props gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am index a68e2f99ca..44c927a867 100644 --- a/win32/Makefile-newvs.am +++ b/win32/Makefile-newvs.am @@ -38,13 +38,6 @@ endif sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ fi -%.props: $(top_builddir)/win32/vs10/Makefile - if test -e $(top_srcdir)/win32/vs10/$@; then \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - elif test -e $(top_builddir)/win32/vs10/$@; then \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - %.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile if test -e $(top_srcdir)/win32/vs10/$@; then \ cp $(top_srcdir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ diff --git a/win32/Makefile.am b/win32/Makefile.am index 4e30405243..98424c3771 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -34,7 +34,8 @@ SUBDIRS = \ vs14 \ vs15 \ vs16 \ - vs17 + vs17 \ + vs1x-props EXTRA_DIST += \ config-msvc.mak \ diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 1ed6395d81..b49bb752fe 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -18,8 +18,7 @@ GENERATED_ITEMS = \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxproj \ - gailutil-3.vcxproj.filters \ - gtk3-version-paths.props + gailutil-3.vcxproj.filters EXTRA_DIST += \ README.txt \ @@ -53,8 +52,6 @@ EXTRA_DIST += \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ gtk3-introspect.vcxproj \ - gtk3-build-defines.props \ - gtk3-version-paths.props.in \ $(GENERATED_ITEMS) DISTCLEANFILES = \ diff --git a/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin index 5e4f3e5415..df35a803fa 100644 --- a/win32/vs10/broadwayd.vcxprojin +++ b/win32/vs10/broadwayd.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin index b28b1df7e8..d469f32c02 100644 --- a/win32/vs10/gailutil-3.vcxprojin +++ b/win32/vs10/gailutil-3.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin index 19416703a4..8e469683e5 100644 --- a/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin index 9827954fac..26a531fc64 100644 --- a/win32/vs10/gdk3-broadway.vcxprojin +++ b/win32/vs10/gdk3-broadway.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin index 37e5586c01..913818e171 100644 --- a/win32/vs10/gdk3-win32.vcxprojin +++ b/win32/vs10/gdk3-win32.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin index 188340308c..c010b3c26d 100644 --- a/win32/vs10/gtk-3.vcxprojin +++ b/win32/vs10/gtk-3.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj index d88a9e65d7..ee295b2912 100644 --- a/win32/vs10/gtk-builder-tool.vcxproj +++ b/win32/vs10/gtk-builder-tool.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj index da630f7f51..ca69b4e794 100644 --- a/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj index 24717aa73f..207b1ba13e 100644 --- a/win32/vs10/gtk-query-settings.vcxproj +++ b/win32/vs10/gtk-query-settings.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj index b94c809e0c..567971b9cf 100644 --- a/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/win32/vs10/gtk-update-icon-cache.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin index 9167c4c2c4..05c058557c 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin index 76f22e512a..fd4850ccf3 100644 --- a/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin index 70f76d8ccf..e5edefb15b 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj index f2a6dcb6ab..0409671572 100644 --- a/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj index cba81df3c2..7905684ed2 100644 --- a/win32/vs10/gtk3-introspect.vcxproj +++ b/win32/vs10/gtk3-introspect.vcxproj @@ -52,19 +52,19 @@ - + - + - + - + diff --git a/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj index b73d9802cc..dc3136275f 100644 --- a/win32/vs10/gtk3-prebuild.vcxproj +++ b/win32/vs10/gtk3-prebuild.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index 4a083d03cd..c95331e099 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index 7b37d57ae9..4e669865be 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index 72f88d160c..ac099944c3 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index a1ab89dec3..8a95e9eae9 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST_COPIED = \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST_COPIED) EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.Build.props diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index eb567707ec..6bdff1695a 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index b1ee919f95..0ddde0d50e 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -31,9 +31,7 @@ EXTRA_DIST += \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ - gdk3-broadway.vcxproj.filters \ - gtk3-build-defines.props \ - gtk3-version-paths.props + gdk3-broadway.vcxproj.filters DISTCLEANFILES = $(EXTRA_DIST) diff --git a/win32/vs1x-props/Makefile.am b/win32/vs1x-props/Makefile.am new file mode 100644 index 0000000000..7f3bbf6c9e --- /dev/null +++ b/win32/vs1x-props/Makefile.am @@ -0,0 +1,13 @@ +include $(top_srcdir)/Makefile.decl + +GENERATED_ITEMS = gtk3-version-paths.props + +EXTRA_DIST += \ + gtk3-build-defines.props \ + gtk3-version-paths.props.in \ + $(GENERATED_ITEMS) + +DISTCLEANFILES = \ + $(GENERATED_ITEMS) + +-include $(top_srcdir)/git.mk diff --git a/win32/vs10/gtk3-build-defines.props b/win32/vs1x-props/gtk3-build-defines.props similarity index 100% rename from win32/vs10/gtk3-build-defines.props rename to win32/vs1x-props/gtk3-build-defines.props diff --git a/win32/vs10/gtk3-version-paths.props.in b/win32/vs1x-props/gtk3-version-paths.props.in similarity index 87% rename from win32/vs10/gtk3-version-paths.props.in rename to win32/vs1x-props/gtk3-version-paths.props.in index f8c0a16bba..5c34e804d5 100644 --- a/win32/vs10/gtk3-version-paths.props.in +++ b/win32/vs1x-props/gtk3-version-paths.props.in @@ -1,7 +1,14 @@  - 10 + 10 + 10 + 11 + 12 + 14 + 15 + 16 + 17 $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) ..\..\..\vs$(VSVer)\$(Platform) 3.0