From 23eec2f1ce80acbda428fcbc283d23419fda7d91 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Mon, 3 Jun 2013 18:14:06 +0800 Subject: [PATCH] issue #2103 modify some compile setup --- samples/Lua/TestLua/proj.nacl/Makefile | 5 +++++ scripting/lua/proj.nacl/Makefile | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/samples/Lua/TestLua/proj.nacl/Makefile b/samples/Lua/TestLua/proj.nacl/Makefile index 1c14d8c1ef..1c3e94bed1 100644 --- a/samples/Lua/TestLua/proj.nacl/Makefile +++ b/samples/Lua/TestLua/proj.nacl/Makefile @@ -14,6 +14,11 @@ INCLUDES = -I.. \ SOURCES = main.cpp \ ../Classes/AppDelegate.cpp \ + $(COCOS_ROOT)/scripting/lua/cocos2dx_support/CCLuaEngine.cpp \ + $(COCOS_ROOT)/scripting/lua/cocos2dx_support/CCLuaStack.cpp \ + $(COCOS_ROOT)/scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.cpp \ + $(COCOS_ROOT)/scripting/lua/cocos2dx_support/LuaCocos2d.cpp \ + $(COCOS_ROOT)/scripting/lua/cocos2dx_support/tolua_fix.c include $(COCOS2DX_PATH)/../extensions/proj.nacl/Makefile SOURCES += $(addprefix $(COCOS_ROOT)/extensions/, $(EXTENSIONS_SOURCES)) diff --git a/scripting/lua/proj.nacl/Makefile b/scripting/lua/proj.nacl/Makefile index 519f531765..2a5c081487 100644 --- a/scripting/lua/proj.nacl/Makefile +++ b/scripting/lua/proj.nacl/Makefile @@ -1,5 +1,4 @@ -INCLUDES += -I.. -I../lua -I../tolua \ - -I../Classes -I../../../CocosDenshion/include -I../../../extensions -I../../../external/chipmunk/include/chipmunk +INCLUDES = -I.. -I../lua -I../../../extensions -I../../../external/chipmunk/include/chipmunk SOURCES = ../lua/lapi.c \ ../lua/lauxlib.c \ @@ -35,16 +34,7 @@ SOURCES = ../lua/lapi.c \ ../tolua/tolua_is.c \ ../tolua/tolua_map.c \ ../tolua/tolua_push.c \ - ../tolua/tolua_to.c \ - ../cocos2dx_support/tolua_fix.c \ - ../cocos2dx_support/CCLuaBridge.cpp \ - ../cocos2dx_support/CCLuaEngine.cpp \ - ../cocos2dx_support/CCLuaStack.cpp \ - ../cocos2dx_support/CCLuaValue.cpp \ - ../cocos2dx_support/Cocos2dxLuaLoader.cpp \ - ../cocos2dx_support/LuaCocos2d.cpp \ - ../cocos2dx_support/CCBProxy.cpp \ - ../cocos2dx_support/Lua_extensions_CCB.cpp \ + ../tolua/tolua_to.c COCOS_ROOT = ../../..