Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[WIP] Windows port: pass arguments through a file

This needs to be used on MinGW/MSYS only, but how?

https://bugzilla.gnome.org/show_bug.cgi?id=620566
  • Loading branch information...
commit cc3655e2ec3ceef0b8ce34b4d5aeaf6a40d32096 1 parent d97438a
Dieter Verfaillie authored
Showing with 13 additions and 4 deletions.
  1. +13 −4 Makefile.introspection
17 Makefile.introspection
View
@@ -130,8 +130,9 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_SCANNERFLAGS)),
# needs to be added manually.
$(1): $$($(_gir_name)_FILES)
@ $(MKDIR_P) $(dir $(1))
- $(_gir_silent_scanner_prefix) $(INTROSPECTION_SCANNER_ENV) $(INTROSPECTION_SCANNER) $(_gir_silent_scanner_opts) \
- $(INTROSPECTION_SCANNER_ARGS) \
+
+ echo $(_gir_silent_scanner_opts) \
+ $(INTROSPECTION_SCANNER_ARGS) \
--namespace=$(_gir_namespace) \
--nsversion=$(_gir_version) \
$(_gir_libtool) \
@@ -144,7 +145,13 @@ $(1): $$($(_gir_name)_FILES)
$($(_gir_name)_CFLAGS) \
$($(_gir_name)_LDFLAGS) \
$$^ \
- --output $(1)
+ --output $(1) > g-ir-scanner.args
+
+ $(_gir_silent_scanner_prefix) \
+ PATH=.:.libs:$(PATH) \
+ $(INTROSPECTION_SCANNER_ENV) \
+ $(INTROSPECTION_SCANNER) \
+ --args-file=g-ir-scanner.args
endef
$(foreach gir,$(INTROSPECTION_GIRS),$(eval $(call introspection-scanner,$(gir))))
@@ -155,7 +162,9 @@ $(foreach gir,$(INTROSPECTION_GIRS),$(eval $(call introspection-scanner,$(gir)))
# $(2): typelib filename (output)
#
define introspection-compiler
-$(_gir_silent_compiler) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. $(1) -o $(2)
+$(_gir_silent_compiler) \
+PATH=.:.libs:$(PATH) \
+$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. $(1) -o $(2)
endef
# Simple rule to compile a typelib.
Please sign in to comment.
Something went wrong with that request. Please try again.