From 16a8e1d92e262a02d420c964ffbc6285a04f275d Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 27 Aug 2013 17:20:12 +0800 Subject: [PATCH] issue #2732: [Linux, Emscripten] Updating Makefile. --- scripting/lua/proj.emscripten/Makefile | 7 +++---- scripting/lua/proj.linux/Makefile | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripting/lua/proj.emscripten/Makefile b/scripting/lua/proj.emscripten/Makefile index 3a68b6b2ab..472a139433 100644 --- a/scripting/lua/proj.emscripten/Makefile +++ b/scripting/lua/proj.emscripten/Makefile @@ -1,6 +1,6 @@ TARGET = liblua.so -INCLUDES += -I.. -I../lua -I../tolua -I../cocos2dx_support -I../cocos2dx_support/generated \ +INCLUDES += -I.. -I../lua -I../tolua -I../cocos2dx_support -I../../auto-generated/lua-bindings \ -I../Classes -I../../../CocosDenshion/include -I../../../extensions SOURCES = ../lua/lapi.o \ @@ -44,15 +44,14 @@ SOURCES = ../lua/lapi.o \ ../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 \ ../cocos2dx_support/LuaOpengl.cpp \ ../cocos2dx_support/LuaScrollView.cpp \ ../cocos2dx_support/LuaScriptHandlerMgr.cpp \ ../cocos2dx_support/LuaBasicConversions.cpp \ - ../cocos2dx_support/generated/lua_cocos2dx_auto.cpp \ - ../cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp \ + ../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \ + ../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \ ../cocos2dx_support/lua_cocos2dx_manual.cpp \ ../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \ ../cocos2dx_support/lua_cocos2dx_deprecated.cpp diff --git a/scripting/lua/proj.linux/Makefile b/scripting/lua/proj.linux/Makefile index 7bf87661c1..79cc15e845 100644 --- a/scripting/lua/proj.linux/Makefile +++ b/scripting/lua/proj.linux/Makefile @@ -1,6 +1,6 @@ TARGET = liblua.so -INCLUDES += -I.. -I../lua -I../tolua -I../cocos2dx_support -I../cocos2dx_support/generated \ +INCLUDES += -I.. -I../lua -I../tolua -I../cocos2dx_support -I../../auto-generated/lua-bindings \ -I../Classes -I../../../CocosDenshion/include -I../../../extensions -I../../../external/chipmunk/include/chipmunk SOURCES = ../lua/lapi.o \ @@ -44,15 +44,14 @@ SOURCES = ../lua/lapi.o \ ../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 \ ../cocos2dx_support/LuaOpengl.cpp \ ../cocos2dx_support/LuaScrollView.cpp \ ../cocos2dx_support/LuaScriptHandlerMgr.cpp \ ../cocos2dx_support/LuaBasicConversions.cpp \ - ../cocos2dx_support/generated/lua_cocos2dx_auto.cpp \ - ../cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp \ + ../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \ + ../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \ ../cocos2dx_support/lua_cocos2dx_manual.cpp \ ../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \ ../cocos2dx_support/lua_cocos2dx_deprecated.cpp