OLD | NEW |
(Empty) | |
| 1 diff -u Makefile~ Makefile |
| 2 --- Makefile~ 2013-04-17 15:19:57.967079354 +0400 |
| 3 +++ Makefile 2013-04-18 11:28:44.645250220 +0400 |
| 4 @@ -266,14 +266,14 @@ |
| 5 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES)) |
| 6 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE) |
| 7 GYP_GENERATORS=make \ |
| 8 - build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
| 9 + ../gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
| 10 -Ibuild/standalone.gypi --depth=. \ |
| 11 -Dv8_target_arch=$(subst .,,$(suffix $@)) \ |
| 12 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) |
| 13 |
| 14 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE) |
| 15 GYP_GENERATORS=make \ |
| 16 - build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
| 17 + ../gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
| 18 -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS) |
| 19 |
| 20 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN: |
| 21 diff -u Makefile.android~ Makefile.android |
| 22 --- Makefile.android~ 2013-04-12 14:57:41.326068594 +0400 |
| 23 +++ Makefile.android 2013-04-18 11:29:03.253251119 +0400 |
| 24 @@ -93,6 +93,6 @@ |
| 25 GYP_DEFINES="${DEFINES}" \ |
| 26 CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \ |
| 27 CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \ |
| 28 - build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
| 29 + ../gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
| 30 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ |
| 31 -S.${ARCH} ${GYPFLAGS} |
OLD | NEW |