examples/graphics/photo_c_salt/Makefile - Issue 11636027: Add ARM toolchain support.

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: examples/graphics/photo_c_salt/Makefile

Issue 11636027: Add ARM toolchain support. (Closed) Base URL: git@github.com:samclegg/naclports.git@sbc

Patch Set: revert .c file change Created 7 years, 11 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:

View unified diff | Download patch

OLD	NEW
1 # Copyright 2010, The Native Client SDK Authors. All rights reserved.	1 # Copyright 2010, The Native Client SDK Authors. All rights reserved.

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

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

4	4

5 # Makefile for the Photo example.	5 # Makefile for the Photo example.

6	6

7 .PHONY: all carpe clean	7 .PHONY: all carpe clean

8	8

9 NACLPORTS_ROOT ?= ../../..	9 NACLPORTS_ROOT ?= ../../..

10 C_SALT_ROOT ?= $(NACL_SDK_ROOT)/c_salt	10 C_SALT_ROOT ?= $(NACL_SDK_ROOT)/c_salt

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104	104

105 photo_x86_64.nexe: $(OBJECTS_X86_64)	105 photo_x86_64.nexe: $(OBJECTS_X86_64)

106 $(CPP) -m64 $^ $(LDFLAGS) -o $@	106 $(CPP) -m64 $^ $(LDFLAGS) -o $@

107	107

108 clean:	108 clean:

109 -rm -rf $(OBJDIR) $(NACL_MODULES)	109 -rm -rf $(OBJDIR) $(NACL_MODULES)

110	110

111 # Build the required packages.	111 # Build the required packages.

112 $(LIB_JPEG_32):	112 $(LIB_JPEG_32):

113 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \	113 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \

114 » export NACL_PACKAGES_BITSIZE=32; \	114 » export NACL_ARCH=i686; \

115 ./nacl-jpeg-6b.sh)	115 ./nacl-jpeg-6b.sh)

116	116

117 $(LIB_JPEG_64):	117 $(LIB_JPEG_64):

118 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \	118 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \

119 » export NACL_PACKAGES_BITSIZE=64; \	119 » export NACL_ARCH=x86_64; \

120 ./nacl-jpeg-6b.sh)	120 ./nacl-jpeg-6b.sh)

121	121

122 $(BOOST_SMART_PTR_32):	122 $(BOOST_SMART_PTR_32):

123 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \	123 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \

124 » export NACL_PACKAGES_BITSIZE=32; \	124 » export NACL_ARCH=i686; \

125 ./nacl-boost_1_43_0.sh)	125 ./nacl-boost_1_43_0.sh)

126	126

127 $(BOOST_SMART_PTR_64):	127 $(BOOST_SMART_PTR_64):

128 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \	128 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \

129 » export NACL_PACKAGES_BITSIZE=64; \	129 » export NACL_ARCH=x86_64; \

130 ./nacl-boost_1_43_0.sh)	130 ./nacl-boost_1_43_0.sh)

131	131

132 # Download and patch the Carpe sliders.	132 # Download and patch the Carpe sliders.

133 $(CARPE_FILES):	133 $(CARPE_FILES):

134 /bin/bash photo_tool.sh	134 /bin/bash photo_tool.sh

135	135

136 check_variables::	136 check_variables::

137 @echo "C_SALT_ROOT=$(C_SALT_ROOT)"	137 @echo "C_SALT_ROOT=$(C_SALT_ROOT)"

OLD	NEW

« no previous file with comments | « examples/graphics/photo/Makefile ('k') | examples/graphics/xaos/nacl-xaos.sh » ('j') | no next file with comments »