diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-20 17:43:47 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-10-26 18:02:29 +0100 |
| commit | 9173589cc01c4460f3fc3e1a2c005807d677735c (patch) | |
| tree | 04faf5f2622fe6d82c9ad7cc7224a88cd15b80e9 | |
| parent | f6af65770d58a020522275741fd8b7beedeccba3 (diff) | |
| download | qtlocation-mapboxgl-9173589cc01c4460f3fc3e1a2c005807d677735c.tar.gz | |
[node] include node headers in binding.gyp, undef libuv_cflags
| -rw-r--r-- | binding.gyp | 1 | ||||
| -rw-r--r-- | scripts/main.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index 13114cd424..759b8d91da 100644 --- a/binding.gyp +++ b/binding.gyp @@ -11,6 +11,7 @@ ], 'include_dirs': [ + '<(node_root_dir)/include/node', "<!(node -e \"require('nan')\")", ], diff --git a/scripts/main.mk b/scripts/main.mk index bdd861fecb..d902eebfaf 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -95,11 +95,11 @@ Xcode/__project__: print-env $(SUBMODULES) config/$(HOST_SLUG).gypi NODE_PRE_GYP = $(shell npm bin)/node-pre-gyp node/configure: $(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \ - $(GYP_FLAGS) -Dlibuv_ldflags= -Dlibuv_static_libs= + $(GYP_FLAGS) -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= node/xproj: $(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \ - $(GYP_FLAGS) -f xcode -Dlibuv_ldflags= -Dlibuv_static_libs= + $(GYP_FLAGS) -f xcode -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= Makefile/node: Makefile/__project__ node/configure @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n" |