Side by Side Diff: Makefile
Issue 6193234183192576:
Issue 1197 - change local copy of v8 (to 4.3.15) to work with Visual Studio 2013 (Closed)
Patch Set: update
Created Nov. 16, 2015, 4:53 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
createsolution.bat » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 ARCH := x64 | 1 ARCH := x64 |
| 2 | 2 |
| 3 ANDROID_PARAMETERS = OS=android | 3 ANDROID_PARAMETERS = OS=android |
| 4 ifneq ($(ANDROID_ARCH),) | 4 ifneq ($(ANDROID_ARCH),) |
| 5 ifeq ($(ANDROID_ARCH),arm) | 5 ifeq ($(ANDROID_ARCH),arm) |
| 6 ANDROID_PARAMETERS += target_arch=arm android_target_arch=arm | 6 ANDROID_PARAMETERS += target_arch=arm android_target_arch=arm |
| 7 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off | 7 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off |
| 8 ANDROID_PARAMETERS += arm_float_abi=default | 8 ANDROID_PARAMETERS += arm_float_abi=default |
| 9 ANDROID_ABI = armeabi-v7a | 9 ANDROID_ABI = armeabi-v7a |
| 10 else ifeq ($(ANDROID_ARCH),ia32) | 10 else ifeq ($(ANDROID_ARCH),ia32) |
| 11 ANDROID_PARAMETERS += target_arch=x86 android_target_arch=x86 | 11 ANDROID_PARAMETERS += target_arch=x86 android_target_arch=x86 |
| 12 ANDROID_ABI = x86 | 12 ANDROID_ABI = x86 |
| 13 else | 13 else |
| 14 $(error "Unsupported Android architecture: $(ANDROID_ARCH)) | 14 $(error "Unsupported Android architecture: $(ANDROID_ARCH)) |
| 15 endif | 15 endif |
| 16 ANDROID_DEST_DIR = android_$(ANDROID_ARCH).release | 16 ANDROID_DEST_DIR = android_$(ANDROID_ARCH).release |
| 17 endif | 17 endif |
| 18 | 18 |
| 19 TEST_EXECUTABLE = build/out/Debug/tests | 19 TEST_EXECUTABLE = build/out/Debug/tests |
| 20 | 20 |
| 21 .PHONY: all test clean docs v8_android_multi android_multi android_x86 \ | 21 .PHONY: all test clean docs v8_android_multi android_multi android_x86 \ |
| 22 android_arm | 22 android_arm |
| 23 | 23 |
| 24 all: | 24 all: |
| 25 » third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp | 25 » third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) -Dhost_arch=$(shell python ./third_party/v8/build/de tect_v8_host_arch.py) libadblockplus.gyp |
| 26 $(MAKE) -C build | 26 $(MAKE) -C build |
| 27 | 27 |
| 28 test: all | 28 test: all |
| 29 ifdef FILTER | 29 ifdef FILTER |
| 30 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) | 30 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) |
| 31 else | 31 else |
| 32 $(TEST_EXECUTABLE) | 32 $(TEST_EXECUTABLE) |
| 33 endif | 33 endif |
| 34 | 34 |
| 35 docs: | 35 docs: |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 60 APP_ABI=$(ANDROID_ABI) \ | 60 APP_ABI=$(ANDROID_ABI) \ |
| 61 APP_PLATFORM=android-9 \ | 61 APP_PLATFORM=android-9 \ |
| 62 APP_STL=c++_static \ | 62 APP_STL=c++_static \ |
| 63 APP_BUILD_SCRIPT=Makefile \ | 63 APP_BUILD_SCRIPT=Makefile \ |
| 64 NDK_TOOLCHAIN_VERSION=clang3.4 \ | 64 NDK_TOOLCHAIN_VERSION=clang3.4 \ |
| 65 NDK_PROJECT_PATH=. \ | 65 NDK_PROJECT_PATH=. \ |
| 66 NDK_OUT=. \ | 66 NDK_OUT=. \ |
| 67 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) | 67 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
| 68 endif | 68 endif |
| 69 | 69 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
createsolution.bat » ('j')
|
no next file with comments »
