nacltoons/proj.linux/Makefile - Issue 17743003: [nacltoons] Roll cocos2dx + two bug fixes

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

Unified Diff: nacltoons/proj.linux/Makefile

Issue 17743003: [nacltoons] Roll cocos2dx + two bug fixes (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 7 years, 6 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:

Index: nacltoons/proj.linux/Makefile

diff --git a/nacltoons/proj.linux/Makefile b/nacltoons/proj.linux/Makefile

index 06b6aa719a1c4ae5e1830c94d7b8b4b94da84bbd..082c7bfd99232cfff6da63ba663a2d4505232a00 100644

--- a/nacltoons/proj.linux/Makefile

+++ b/nacltoons/proj.linux/Makefile

@@ -30,6 +30,9 @@ SOURCES = main.cc \

include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk

OBJECTS := $(OBJECTS:.cc=.o)

+# lua-yaml has some build warnings so filter out -Werror from the CFLAGS

+CFLAGS := $(filter-out -Werror,$(CFLAGS))

INCLUDES += -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support

INCLUDES += -I$(COCOS_ROOT)/scripting/lua/lua

INCLUDES += -I$(COCOS_ROOT)/external

« no previous file with comments | « nacltoons/data/res/util.lua ('k') | nacltoons/proj.nacl/Makefile » ('j') | no next file with comments »