diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-09 18:36:49 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-09 18:36:49 +0800 |
| commit | df05ec0d05062a911efc929b1ea32ef8d526d0e2 (patch) | |
| tree | ccf8b04671fbb36c108c8915d4f57014efcecc49 | |
| parent | aa7a9e08d33ac01aa43460a064e086b099f71642 (diff) | |
| download | pango-df05ec0d05062a911efc929b1ea32ef8d526d0e2.tar.gz | |
Revert "build/Makefile.msvcproj: Don't Use realpath(1)"
This reverts commit aa7a9e08d33ac01aa43460a064e086b099f71642.
Sorry, I accidently committed this in master, when I am supposed to commit
in my own local branch.
| -rw-r--r-- | build/Makefile.msvcproj | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj index f878ae24..0fe31071 100644 --- a/build/Makefile.msvcproj +++ b/build/Makefile.msvcproj @@ -10,16 +10,19 @@ # # Add this to Makefile.am where your library/program is built: # include $(top_srcdir)/build/Makefile.msvcproj -# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) +# MSVCPROJS = YourProject # YourProject_FILES = $(libyourlib_1_0_SOURCES) # YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none # YourProject_HEADERS_DIR = $(libyourlibincludedir) # YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) # YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none> # -# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) +# dist-hook: \ # (or add to it if it is already there) # $(top_builddir)/build/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/build/win32/vs9/YourProject.headers +# $(top_builddir)/build/win32/vs9/YourProject.headers \ +# $(top_builddir)/build/win32/vs10/YourProject.vcxproj \ +# $(top_builddir)/build/win32/vs10/YourProject.vcxproj.filters \ +# $(top_builddir)/build/win32/vs9/YourProject.vs10.headers # Private functions @@ -27,7 +30,7 @@ ## 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)/,$(empty),$(abs_srcdir)) +_proj_path_raw:=$(shell realpath --relative-to=$(top_srcdir) $(srcdir)) _proj_path=$(subst /,\\,$(_proj_path_raw)) _proj_subdir_int=$(if $(ifeq $(_proj_path),\.),\\,\\$(_proj_path)\\) _proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) |