summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2017-02-17 18:12:51 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2017-02-17 18:12:51 +0800
commitf4d0e07b9f4a77e941a598ff6a68371db887bf91 (patch)
treeaf5ed8085d80d00238e5f183a8fb76dd1af1b723
parentd52e120f9510e9040696057aa0da0f6ec3959cdd (diff)
downloadgobject-introspection-f4d0e07b9f4a77e941a598ff6a68371db887bf91.tar.gz
win32/Makefile.msvc-introspection
This is a follow-up commit to Evan Nemerson's addition to Makefile.introspection so that we can pass in a number of C includes so that we make generate the full NMake Makefile module with the command line to call g-ir-scanner in a simpler and cleaner way.
-rw-r--r--win32/Makefile.msvc-introspection6
1 files changed, 5 insertions, 1 deletions
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
index 28e8b50b..0af2d4ff 100644
--- a/win32/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -27,7 +27,9 @@
# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
+# YourLib_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
+# YourLib_1_0_gir_MSVC_C_INCLUDES = (List of public C headers which need to be included by
+# consumers at compile time to make use of the API)
# Private functions
@@ -63,6 +65,7 @@ _gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
+_gir_c_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_C_INCLUDES),--c-include=$(include))
#
# Create NMake Makefile Sections for Building Introspection files
@@ -104,6 +107,7 @@ $(top_builddir)/win32/$(1).msvc.introspect:
echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect
echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_c_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect
echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect