Makefile - Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: Makefile

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)

Patch Set: Created July 11, 2014, 2:24 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

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	6

7 TEST_EXECUTABLE = build/out/Debug/tests	7 TEST_EXECUTABLE = build/out/Debug/tests

8	8

9 .PHONY: all test clean v8_android android	9 .PHONY: all test clean v8_android android

10	10

(...skipping 17 matching lines...) Expand all Loading...
28 DEFINES="${ANDROID_PARAMETERS}" \	28 DEFINES="${ANDROID_PARAMETERS}" \

29 OUTDIR=../../build \	29 OUTDIR=../../build \

30 $(MAKE) -C third_party/v8 android_arm.release	30 $(MAKE) -C third_party/v8 android_arm.release

31	31

32 android: v8_android	32 android: v8_android

33 GYP_DEFINES="${ANDROID_PARAMETERS}" \	33 GYP_DEFINES="${ANDROID_PARAMETERS}" \

34 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp	34 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp

35 ndk-build -C build installed_modules \	35 ndk-build -C build installed_modules \

36 BUILDTYPE=Release \	36 BUILDTYPE=Release \

37 APP_PLATFORM=android-9 \	37 APP_PLATFORM=android-9 \

38 » APP_STL=gnustl_static \	38 » APP_STL=c++_static \

39 APP_BUILD_SCRIPT=Makefile \	39 APP_BUILD_SCRIPT=Makefile \

	40 NDK_TOOLCHAIN_VERSION=clang3.4 \

40 NDK_PROJECT_PATH=. \	41 NDK_PROJECT_PATH=. \

41 NDK_OUT=. \	42 NDK_OUT=. \

42 NDK_APP_DST_DIR=android_arm.release	43 NDK_APP_DST_DIR=android_arm.release

OLD	NEW

« .hgsubstate ('K') | « .hgsubstate ('k') | common.gypi » ('j') | include/AdblockPlus/FilterEngine.h » ('J')