From 8c261c17891bc8daa3b1c6ec5fdbaa4ee9d90239 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Wed, 6 Feb 2013 15:59:29 +0800
Subject: [PATCH] issue #1770: Updating linux makefile.

---
 samples/Lua/HelloLua/proj.linux/Makefile |  4 +---
 samples/Lua/TestLua/proj.linux/Makefile  |  4 +---
 scripting/lua/proj.linux/Makefile        | 28 +++++++++++++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/samples/Lua/HelloLua/proj.linux/Makefile b/samples/Lua/HelloLua/proj.linux/Makefile
index 83fbe32ee5..f8d32f46b5 100644
--- a/samples/Lua/HelloLua/proj.linux/Makefile
+++ b/samples/Lua/HelloLua/proj.linux/Makefile
@@ -42,9 +42,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
 				$(STATICLIBS_DIR)/libtiff.a \
 #				$(STATICLIBS_DIR)/libGLEW.a \
 
-SHAREDLIBS += -lglfw -lcurl -llua
-SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
-SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
+SHAREDLIBS += -lglfw -lcurl -llua -lGLEW
 SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug
 
 ifeq ($(LBITS),64)
diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile
index ec855c3f89..b195183560 100644
--- a/samples/Lua/TestLua/proj.linux/Makefile
+++ b/samples/Lua/TestLua/proj.linux/Makefile
@@ -46,9 +46,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
 				../../../../lib/linux/Debug/libbox2d.a \
 				../../../../lib/linux/Debug/libchipmunk.a
 
-SHAREDLIBS += -lglfw -lcurl -llua
-SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
-SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
+SHAREDLIBS += -lglfw -lcurl -llua -lGLEW
 SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug
 
 ifeq ($(LBITS),64)
diff --git a/scripting/lua/proj.linux/Makefile b/scripting/lua/proj.linux/Makefile
index e309a94483..fef0df8872 100644
--- a/scripting/lua/proj.linux/Makefile
+++ b/scripting/lua/proj.linux/Makefile
@@ -9,6 +9,21 @@ LBITS := $(shell getconf LONG_BIT)
 INCLUDES = -I../lua \
            -I../tolua \
 
+COCOS2DX_PATH = ../../../cocos2dx
+INCLUDES +=  -I../ \
+			-I../Classes \
+			-I$(COCOS2DX_PATH) \
+			-I$(COCOS2DX_PATH)/platform/third_party/linux \
+			-I$(COCOS2DX_PATH)/platform/third_party/linux/libfreetype2 \
+			-I$(COCOS2DX_PATH)/cocoa \
+			-I$(COCOS2DX_PATH)/include \
+			-I$(COCOS2DX_PATH)/platform/linux \
+			-I$(COCOS2DX_PATH)/kazmath/include \
+			-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
+			-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \
+			-I../../../CocosDenshion/include 
+
+
 DEFINES = -DLINUX
 
 OBJECTS = ../lua/lapi.o \
@@ -47,12 +62,13 @@ OBJECTS = ../lua/lapi.o \
           ../tolua/tolua_map.o \
           ../tolua/tolua_push.o \
           ../tolua/tolua_to.o \
-          ../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/tolua_fix.o \
+          ../cocos2dx_support/CCLuaBridge.o \
+          ../cocos2dx_support/CCLuaEngine.o \
+          ../cocos2dx_support/CCLuaStack.o \
+          ../cocos2dx_support/CCLuaValue.o \
+          ../cocos2dx_support/Cocos2dxLuaLoader.o \
+          ../cocos2dx_support/LuaCocos2d.o 
 
 STATICLIBS =