From a21d7688b95ae62034962bfc1e34801935dd670a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 25 Sep 2015 15:33:02 +0800 Subject: Build: Make Makefile.msvcproj A Bit More Generic Handle also the situation where $(srcdir) == $(top_srcdir), so that this can also be used in cases like librsvg and gobject-introspection. --- build/Makefile.msvcproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj index 5d9cdc52..9449a5b9 100644 --- a/build/Makefile.msvcproj +++ b/build/Makefile.msvcproj @@ -2,6 +2,10 @@ # Common Autotools file used to generate Visual Studio 2008+ # Projects from their templates +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + # * Input variables: # # MSVCPROJS - List of Projects that should be generated @@ -27,9 +31,9 @@ ## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable ## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 _proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) -_proj_path_raw:=$(subst $(abs_top_srcdir)/,,$(abs_srcdir)) +_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) _proj_path=$(subst /,\\,$(_proj_path_raw)) -_proj_subdir_int=$(if $(ifeq $(_proj_path),\.),\\,\\$(_proj_path)\\) +_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) _proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) _proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) -- cgit v1.2.1