Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « nacltoons/data/res/util.lua ('k') | nacltoons/proj.nacl/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 EXECUTABLE = nacltoons 1 EXECUTABLE = nacltoons
2 2
3 COCOS_ROOT = ../third_party/cocos2d-x 3 COCOS_ROOT = ../third_party/cocos2d-x
4 LUA_YAML_ROOT = ../third_party/lua-yaml 4 LUA_YAML_ROOT = ../third_party/lua-yaml
5 5
6 INCLUDES = -I.. -I../src -I../src/third_party -I../bindings \ 6 INCLUDES = -I.. -I../src -I../src/third_party -I../bindings \
7 -I$(COCOS_ROOT)/samples/Cpp/TestCpp/Classes/Box2DTestBed 7 -I$(COCOS_ROOT)/samples/Cpp/TestCpp/Classes/Box2DTestBed
8 8
9 USE_BOX2D = 1 9 USE_BOX2D = 1
10 10
(...skipping 12 matching lines...) Expand all
23 lua-yaml/loader.c \ 23 lua-yaml/loader.c \
24 lua-yaml/parser.c \ 24 lua-yaml/parser.c \
25 lua-yaml/reader.c \ 25 lua-yaml/reader.c \
26 lua-yaml/scanner.c \ 26 lua-yaml/scanner.c \
27 lua-yaml/writer.c \ 27 lua-yaml/writer.c \
28 lua-yaml/b64.c 28 lua-yaml/b64.c
29 29
30 include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk 30 include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk
31 OBJECTS := $(OBJECTS:.cc=.o) 31 OBJECTS := $(OBJECTS:.cc=.o)
32 32
33 # lua-yaml has some build warnings so filter out -Werror from the CFLAGS
34 CFLAGS := $(filter-out -Werror,$(CFLAGS))
35
33 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support 36 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support
34 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/lua 37 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/lua
35 INCLUDES += -I$(COCOS_ROOT)/external 38 INCLUDES += -I$(COCOS_ROOT)/external
36 INCLUDES += -I$(COCOS_ROOT)/extensions 39 INCLUDES += -I$(COCOS_ROOT)/extensions
37 INCLUDES += -I$(LUA_YAML_ROOT) 40 INCLUDES += -I$(LUA_YAML_ROOT)
38 41
39 SHAREDLIBS += -lcocos2d -llua -lcocosdenshion -lbox2d -lextension 42 SHAREDLIBS += -lcocos2d -llua -lcocosdenshion -lbox2d -lextension
40 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libbox2d.a $(LIB_DIR)/libextens ion.a 43 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libbox2d.a $(LIB_DIR)/libextens ion.a
41 44
42 cocos $(COCOS_LIBS): 45 cocos $(COCOS_LIBS):
(...skipping 29 matching lines...) Expand all
72 run: publish 75 run: publish
73 76
74 debug: $(TARGET) publish 77 debug: $(TARGET) publish
75 cd $(dir $^) && gdb ./$(notdir $<) --ex run 78 cd $(dir $^) && gdb ./$(notdir $<) --ex run
76 79
77 publish: validate 80 publish: validate
78 @mkdir -p $(BIN_DIR) 81 @mkdir -p $(BIN_DIR)
79 cp -ar ../data/res/* $(BIN_DIR) 82 cp -ar ../data/res/* $(BIN_DIR)
80 83
81 .PHONY: publish cocos validate 84 .PHONY: publish cocos validate
OLDNEW
« no previous file with comments | « nacltoons/data/res/util.lua ('k') | nacltoons/proj.nacl/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698