@@ -8,6 +8,7 @@ MAKEFLAGS=-r
8
8
9
9
# The source directory tree.
10
10
srcdir := ../../../..
11
+ abs_srcdir := $(abspath $(srcdir ) )
11
12
12
13
# The name of the builddir.
13
14
builddir_name ?= out
20
21
endif
21
22
22
23
# Specify BUILDTYPE=Release on the command line for a release build.
23
- BUILDTYPE ?= Default
24
+ BUILDTYPE ?= Debug
24
25
25
26
# Directory all our build output goes into.
26
27
# Note that this must be two directories beneath src/ for unit tests to pass,
@@ -147,7 +148,7 @@ cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
147
148
quiet_cmd_pch_c = CXX($(TOOLSET ) ) $@
148
149
cmd_pch_c = $(CC.$(TOOLSET ) ) $(GYP_PCH_CFLAGS ) $(DEPFLAGS ) $(CXXFLAGS.$(TOOLSET ) ) -c -o $@ $<
149
150
quiet_cmd_pch_cc = CXX($(TOOLSET ) ) $@
150
- cmd_pch_cc = $(CC.$(TOOLSET ) ) $(GYP_PCH_CCFLAGS ) $(DEPFLAGS ) $(CXXFLAGS.$(TOOLSET ) ) -c -o $@ $<
151
+ cmd_pch_cc = $(CC.$(TOOLSET ) ) $(GYP_PCH_CXXFLAGS ) $(DEPFLAGS ) $(CXXFLAGS.$(TOOLSET ) ) -c -o $@ $<
151
152
quiet_cmd_pch_m = CXX($(TOOLSET ) ) $@
152
153
cmd_pch_m = $(CC.$(TOOLSET ) ) $(GYP_PCH_OBJCFLAGS ) $(DEPFLAGS ) -c -o $@ $<
153
154
quiet_cmd_pch_mm = CXX($(TOOLSET ) ) $@
@@ -162,6 +163,9 @@ cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@"
162
163
quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@
163
164
cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@ " $(4 )
164
165
166
+ quiet_cmd_infoplist = INFOPLIST $@
167
+ cmd_infoplist = $(CC.$(TOOLSET ) ) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES ) "$< " -o "$@ "
168
+
165
169
quiet_cmd_touch = TOUCH $@
166
170
cmd_touch = touch $@
167
171
@@ -262,8 +266,8 @@ $(if $(or $(command_changed),$(prereq_changed)),
262
266
)
263
267
endef
264
268
265
- # Declare "all" target first so it is the default, even though we don't have the
266
- # deps yet.
269
+ # Declare the "all" target first so it is the default,
270
+ # even though we don't have the deps yet.
267
271
.PHONY : all
268
272
all :
269
273
@@ -343,9 +347,9 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
343
347
include src/libuv/uv.target.mk
344
348
endif
345
349
346
- quiet_cmd_regen_makefile = ACTION Regenerating $@
347
- cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/libuv/uv.gyp
348
- Makefile : $(srcdir ) /src/libuv/uv.gyp
350
+ # quiet_cmd_regen_makefile = ACTION Regenerating $@
351
+ # cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." -Isrc/libuv/common.gypi "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Ddefault_configuration=Default" "-Dcomponent=static_library " "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/libuv/uv.gyp
352
+ # Makefile: $(srcdir)/src/libuv/uv.gyp $(srcdir)/src/libuv/common.gypi
349
353
# $(call do_cmd,regen_makefile)
350
354
351
355
# "all" is a concatenation of the "all" targets from all the included
0 commit comments