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

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

Delta Between Two Patch Sets: Makefile

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

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

Right Patch Set: fix including of <memory> Created Aug. 7, 2015, 6:07 a.m.

Left:
Right:

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

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
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	7

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

8	9

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

10	11

11 all:	12 all:

12 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp	13 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp

13 $(MAKE) -C build	14 $(MAKE) -C build

14	15

15 test: all	16 test: all

16 ifdef FILTER	17 ifdef FILTER

17 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER)	18 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER)

18 else	19 else

19 $(TEST_EXECUTABLE)	20 $(TEST_EXECUTABLE)

20 endif	21 endif

21	22

	23 docs:

	24 doxygen

	25

22 clean:	26 clean:

23 » $(RM) -r build	27 » $(RM) -r build docs

24	28

25 v8_android:	29 v8_android:

26 mkdir -p third_party/v8/build/gyp	30 mkdir -p third_party/v8/build/gyp

27 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp	31 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp

28 DEFINES="${ANDROID_PARAMETERS}" \	32 DEFINES="${ANDROID_PARAMETERS}" \

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

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

31	35

32 android: v8_android	36 android: v8_android

33 GYP_DEFINES="${ANDROID_PARAMETERS}" \	37 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	38 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 \	39 » $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \

36 BUILDTYPE=Release \	40 BUILDTYPE=Release \

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

38 APP_STL=c++_static \	42 APP_STL=c++_static \

39 APP_BUILD_SCRIPT=Makefile \	43 APP_BUILD_SCRIPT=Makefile \

40 NDK_TOOLCHAIN_VERSION=clang3.4 \	44 NDK_TOOLCHAIN_VERSION=clang3.4 \

41 NDK_PROJECT_PATH=. \	45 NDK_PROJECT_PATH=. \

42 NDK_OUT=. \	46 NDK_OUT=. \

43 NDK_APP_DST_DIR=android_arm.release	47 NDK_APP_DST_DIR=android_arm.release

LEFT	RIGHT