issue #1770: Updating linux makefile.

This commit is contained in:
James Chen 2013-02-06 15:59:29 +08:00
parent 561f6ca435
commit 8c261c1789
3 changed files with 24 additions and 12 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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 =