diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-01-20 15:56:31 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-01-20 15:56:31 +0800 |
| commit | ec025d2b1646505549a3c806101a364c011e365b (patch) | |
| tree | fa2413330034739cb2bf84b2762715972c5c89ba /pango/Makefile.am | |
| parent | f47aa5a4690ce686ec70fb7c3c9a84251cdb5706 (diff) | |
| download | pango-ec025d2b1646505549a3c806101a364c011e365b.tar.gz | |
Visual Studio builds: Move projects to win32/
This allows one to go down one less level in the directory tree to get to the
Visual Studio project files, and so make things more in line with the rest of
the GTK+ stack. This also cleans up the Visual Studio 201x projects as there
are some items that can be actually combined.
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 4fddcaab..6df7d52c 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -490,7 +490,7 @@ pangoft2_EXCLUDES = dummy pangocairo_FILES = $(pangocairo_core_sources) pangocairo_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -502,17 +502,17 @@ BASE_MSVC_GIR_CFLAGS = \ -DPANGO_ENABLE_ENGINE INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Pango-1.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Pango_1_0_gir_list \ - $(top_builddir)/build/win32/PangoCairo-1.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/PangoCairo_1_0_gir_list + $(top_builddir)/win32/Pango-1.0.gir.msvc.introspect \ + $(top_builddir)/win32/Pango_1_0_gir_list \ + $(top_builddir)/win32/PangoCairo-1.0.gir.msvc.introspect \ + $(top_builddir)/win32/PangoCairo_1_0_gir_list Pango_1_0_gir_MSVC_FILES = $(Pango_1_0_gir_FILES) Pango_1_0_gir_MSVC_PACKAGES = gobject-2.0 cairo glib-2.0 Pango_1_0_gir_MSVC_EXPORT_PACKAGES = $(Pango_1_0_gir_EXPORT_PACKAGES) Pango_1_0_gir_MSVC_INCLUDE_GIRS = $(Pango_1_0_gir_INCLUDES) Pango_1_0_gir_MSVC_LIBS = pango-1.0 -Pango_1_0_gir_MSVC_CFLAGS = -I../.. $(BASE_MSVC_GIR_CFLAGS) +Pango_1_0_gir_MSVC_CFLAGS = -I.. $(BASE_MSVC_GIR_CFLAGS) Pango_1_0_gir_MSVC_SCANNERFLAGS = $(Pango_1_0_gir_SCANNERFLAGS) pangocairo_msvc_introspection_files = \ @@ -531,17 +531,17 @@ PangoCairo_1_0_gir_MSVC_LIBS = $(Pango_1_0_gir_MSVC_LIBS) pangocairo-1.0 PangoCairo_1_0_gir_MSVC_CFLAGS = $(Pango_1_0_gir_MSVC_CFLAGS) PangoCairo_1_0_gir_MSVC_SCANNERFLAGS = --include-uninstalled=./Pango-1.0.gir --c-include "pango/pangocairo.h" -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs9/pango.vcproj \ - $(top_builddir)/build/win32/vs9/pangowin32.vcproj \ - $(top_builddir)/build/win32/vs9/pangoft2.vcproj \ - $(top_builddir)/build/win32/vs9/pangocairo.vcproj \ - $(top_builddir)/build/win32/vs9/pango.headers \ + $(top_builddir)/win32/vs9/pango.vcproj \ + $(top_builddir)/win32/vs9/pangowin32.vcproj \ + $(top_builddir)/win32/vs9/pangoft2.vcproj \ + $(top_builddir)/win32/vs9/pangocairo.vcproj \ + $(top_builddir)/win32/vs9/pango.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) -include $(top_srcdir)/git.mk |