ports/opencv/build.sh - Issue 1804293003: Add support for new pnacl native toolchain driver

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
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

	Issue
u :	up to list of issues
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

Side by Side Diff: ports/opencv/build.sh

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master

Patch Set: Fix according to Brad's comments Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 # Copyright 2013 The Native Client Authors. All rights reserved.	1 # Copyright 2013 The Native Client Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4 NACLPORTS_CPPFLAGS+=" ${NACL_EXCEPTIONS_FLAG}"

5 EXECUTABLES="	5 EXECUTABLES="

6 bin/opencv_createsamples	6 bin/opencv_createsamples

7 bin/opencv_haartraining	7 bin/opencv_haartraining

8 bin/opencv_performance	8 bin/opencv_performance

9 bin/opencv_traincascade	9 bin/opencv_traincascade

10 "	10 "

11 EXTRA_CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF \	11 EXTRA_CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF \

12 -DWITH_FFMPEG=OFF \	12 -DWITH_FFMPEG=OFF \

13 -DWITH_OPENEXR=OFF \	13 -DWITH_OPENEXR=OFF \

14 -DWITH_CUDA=OFF \	14 -DWITH_CUDA=OFF \

15 -DWITH_JASPER=OFF \	15 -DWITH_JASPER=OFF \

16 -DWITH_OPENCL=OFF \	16 -DWITH_OPENCL=OFF \

17 -DWITH_1394=OFF \	17 -DWITH_1394=OFF \

18 -DWITH_V4L=OFF \	18 -DWITH_V4L=OFF \

19 -DBUILD_opencv_java=OFF \	19 -DBUILD_opencv_java=OFF \

20 -DBUILD_TESTS=OFF \	20 -DBUILD_TESTS=OFF \

21 -DBUILD_PERF_TESTS=OFF \	21 -DBUILD_PERF_TESTS=OFF \

22 -DBUILD_FAT_JAVA_LIB=OFF"	22 -DBUILD_FAT_JAVA_LIB=OFF"

23	23

24 if [ "${NACL_SHARED}" != "1" ]; then	24 if [ "${NACL_SHARED}" != "1" ]; then

25 EXTRA_CMAKE_ARGS+=" -DBUILD_SHARED_LIBS=OFF"	25 EXTRA_CMAKE_ARGS+=" -DBUILD_SHARED_LIBS=OFF"

26 fi	26 fi

OLD	NEW