Side by Side Diff: Makefile
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: rebase
Created Aug. 5, 2015, 10:38 a.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
|
README.md » ('j')
|
README.md » ('J')
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 = target_arch=arm OS=android | 3 ANDROID_PARAMETERS = target_arch=arm OS=android |
| 4 ANDROID_PARAMETERS += android_target_arch=arm | 4 ANDROID_PARAMETERS += android_target_arch=arm |
| 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off | 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off |
| 6 ANDROID_PARAMETERS += arm_float_abi=default | 6 ANDROID_PARAMETERS += arm_float_abi=default |
| 7 | 7 |
| 8 TEST_EXECUTABLE = build/out/Debug/tests | 8 TEST_EXECUTABLE = build/out/Debug/tests |
| 9 | 9 |
| 10 .PHONY: all test clean v8_android android docs | 10 .PHONY: all test clean v8_android android docs |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 DEFINES="${ANDROID_PARAMETERS}" \ | 32 DEFINES="${ANDROID_PARAMETERS}" \ |
| 33 OUTDIR=../../build \ | 33 OUTDIR=../../build \ |
| 34 $(MAKE) -C third_party/v8 android_arm.release | 34 $(MAKE) -C third_party/v8 android_arm.release |
| 35 | 35 |
| 36 android: v8_android | 36 android: v8_android |
| 37 GYP_DEFINES="${ANDROID_PARAMETERS}" \ | 37 GYP_DEFINES="${ANDROID_PARAMETERS}" \ |
| 38 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp | 38 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp |
| 39 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ | 39 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ |
| 40 BUILDTYPE=Release \ | 40 BUILDTYPE=Release \ |
| 41 APP_PLATFORM=android-9 \ | 41 APP_PLATFORM=android-9 \ |
| 42 » APP_STL=gnustl_static \ | 42 » APP_STL=c++_static \ |
| 43 APP_BUILD_SCRIPT=Makefile \ | 43 APP_BUILD_SCRIPT=Makefile \ |
| 44 NDK_TOOLCHAIN_VERSION=clang3.4 \ | |
| 44 NDK_PROJECT_PATH=. \ | 45 NDK_PROJECT_PATH=. \ |
| 45 NDK_OUT=. \ | 46 NDK_OUT=. \ |
| 46 NDK_APP_DST_DIR=android_arm.release | 47 NDK_APP_DST_DIR=android_arm.release |
| OLD | NEW |
