From f5db6c6e65f52703a4ad7121aa6ae0441c51ad74 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 19 Oct 2016 14:48:08 +0800 Subject: build/: Force MSVC project file generation on Makefile.am changes Make the Makefile.am targets for generating the Visual Studio projects re-generate the project files and the header listings whenever the Makefile.am's that include build/Makefile.msvcproj changes, so that whenever a source/header is added, they will be reflected in the projects and in the property sheets that are used to copy the headers. Also ensure that these are applied to the vs11, vs12 and vs14 projects when this happens, as they are copied and processed from the Visual Studio 2010 projects. --- build/Makefile-newvs.am | 2 +- build/Makefile.msvcproj | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index 97b2459..b5e3216 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -30,7 +30,7 @@ sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: +%.props: $(top_builddir)/build/win32/vs10/Makefile if test -e $(top_srcdir)/build/win32/vs10/$@; then \ sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj index 9449a5b..f127eea 100644 --- a/build/Makefile.msvcproj +++ b/build/Makefile.msvcproj @@ -60,10 +60,17 @@ $(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs9/$(1).vcproj: +$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters + for F in $(_proj_files); do \ case $$$$F in \ @@ -87,7 +94,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj: $(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers -$(top_builddir)/build/win32/vs9/$(1).headers: +$(top_builddir)/build/win32/vs9/$(1).headers: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers -- cgit v1.2.1