Chromium Code Reviews Chromium Code Reviews
Issue 17743003:
[nacltoons] Roll cocos2dx + two bug fixes (Closed)
Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src| OLD | NEW |
|---|---|
| 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 11 matching lines...) Expand all Loading... | |
| 22 lua-yaml/emitter.c \ | 22 lua-yaml/emitter.c \ |
| 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 CFLAGS := $(filter-out -Werror,$(CFLAGS)) | |
|
binji
2013/06/25 22:17:21
mention which warnings are causing issues? (so thi
Sam Clegg
2013/06/26 00:01:25
Done.
| |
| 32 | 33 |
| 33 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support | 34 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support |
| 34 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/lua | 35 INCLUDES += -I$(COCOS_ROOT)/scripting/lua/lua |
| 35 INCLUDES += -I$(COCOS_ROOT)/external | 36 INCLUDES += -I$(COCOS_ROOT)/external |
| 36 INCLUDES += -I$(COCOS_ROOT)/extensions | 37 INCLUDES += -I$(COCOS_ROOT)/extensions |
| 37 INCLUDES += -I$(LUA_YAML_ROOT) | 38 INCLUDES += -I$(LUA_YAML_ROOT) |
| 38 | 39 |
| 39 SHAREDLIBS += -lcocos2d -llua -lcocosdenshion -lbox2d -lextension | 40 SHAREDLIBS += -lcocos2d -llua -lcocosdenshion -lbox2d -lextension |
| 40 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libbox2d.a $(LIB_DIR)/libextens ion.a | 41 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libbox2d.a $(LIB_DIR)/libextens ion.a |
| 41 | 42 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 72 run: publish | 73 run: publish |
| 73 | 74 |
| 74 debug: $(TARGET) publish | 75 debug: $(TARGET) publish |
| 75 cd $(dir $^) && gdb ./$(notdir $<) --ex run | 76 cd $(dir $^) && gdb ./$(notdir $<) --ex run |
| 76 | 77 |
| 77 publish: validate | 78 publish: validate |
| 78 @mkdir -p $(BIN_DIR) | 79 @mkdir -p $(BIN_DIR) |
| 79 cp -ar ../data/res/* $(BIN_DIR) | 80 cp -ar ../data/res/* $(BIN_DIR) |
| 80 | 81 |
| 81 .PHONY: publish cocos validate | 82 .PHONY: publish cocos validate |
| OLD | NEW |
