nacltoons/game.mk - Issue 12094088: Don't ignore failures in build-cocos2dx.sh.

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: nacltoons/game.mk

Issue 12094088: Don't ignore failures in build-cocos2dx.sh. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 7 years, 10 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 | Annotate | Revision Log

OLD	NEW
1 NACL_ARCH = x86_64	1 NACL_ARCH = x86_64

2 NACL_LIBC = newlib	2 NACL_LIBC = newlib

3 OS ?= linux	3 OS ?= linux

4	4

5 ifeq ($(NACL_ARCH),arm)	5 ifeq ($(NACL_ARCH),arm)

6 TOOLCHAIN_DIR=$(OS)_arm_newlib	6 TOOLCHAIN_DIR=$(OS)_arm_newlib

7 else	7 else

8 TOOLCHAIN_DIR=$(OS)_x86_newlib	8 TOOLCHAIN_DIR=$(OS)_x86_newlib

9 endif	9 endif

10	10

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 mkdir -p $(BIN_DIR)	67 mkdir -p $(BIN_DIR)

68 $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS)	68 $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS)

69	69

70 ####### Compile	70 ####### Compile

71 %.o: %.cpp	71 %.o: %.cpp

72 $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@	72 $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@

73	73

74 %.o: %.c	74 %.o: %.c

75 $(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@	75 $(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@

76	76

77 clean:	77 clean::

78 rm -f $(OBJECTS) $(TARGET) core	78 rm -f $(OBJECTS) $(TARGET) core

79	79

80	80

81 $(NMF): $(TARGET)	81 $(NMF): $(TARGET)

82 $(NACL_SDK_ROOT)/tools/create_nmf.py -o $(NMF) $(TARGET) --objdump=i686- nacl-objdump -L$(NACL_SDK_ROOT)/toolchain/linux_x86_newlib/x86_64-nacl/lib/ -s $ (BIN_DIR)	82 $(NACL_SDK_ROOT)/tools/create_nmf.py -o $(NMF) $(TARGET) --objdump=i686- nacl-objdump -L$(NACL_SDK_ROOT)/toolchain/linux_x86_newlib/x86_64-nacl/lib/ -s $ (BIN_DIR)

83	83

84 run: all	84 run: all

85 $(NACL_SDK_ROOT)/tools/httpd.py --no_dir_check	85 $(NACL_SDK_ROOT)/tools/httpd.py --no_dir_check

86	86

87 .PHONY: run clean nmf	87 .PHONY: run clean nmf

OLD	NEW

« no previous file with comments | « nacltoons/build/build-naclports.sh ('k') | no next file » | no next file with comments »