From 680fbe3517132f0c0eda2d2960dce48eca4cf8d8 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 22 Jan 2013 15:21:37 +0800 Subject: [PATCH] Fixed compilation errors for linux port. --- cocos2dx/proj.linux/Makefile | 2 +- make-all-linux-project.sh | 2 ++ samples/Cpp/HelloCpp/proj.linux/Makefile | 2 +- samples/Cpp/TestCpp/proj.linux/Makefile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile index 478b067126..4251ec3ad1 100644 --- a/cocos2dx/proj.linux/Makefile +++ b/cocos2dx/proj.linux/Makefile @@ -168,7 +168,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ $(STATICLIBS_DIR)/libtiff.a SHAREDLIBS = -SHAREDLIBS += -lglfw -lGL -lcurl -lfontconfig +SHAREDLIBS += -lglfw -lcurl -lfontconfig 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 diff --git a/make-all-linux-project.sh b/make-all-linux-project.sh index 440c9955da..858350830e 100755 --- a/make-all-linux-project.sh +++ b/make-all-linux-project.sh @@ -29,6 +29,8 @@ if ! test -d $DIR_GLEW170/glew-1.7.0/; then DEPENDS+=' libcurl4-gnutls-dev' DEPENDS+=' libfontconfig1-dev' DEPENDS+=' libsqlite3-dev' + DEPENDS+=' glew-dev' + for i in $DEPENDS; do echo -e $TXTCOLOR_GREEN"sudo apt-get install $i, please enter your password:"$TXTCOLOR_DEFAULT sudo apt-get install $i diff --git a/samples/Cpp/HelloCpp/proj.linux/Makefile b/samples/Cpp/HelloCpp/proj.linux/Makefile index 3d845f50e3..d9ddae461c 100644 --- a/samples/Cpp/HelloCpp/proj.linux/Makefile +++ b/samples/Cpp/HelloCpp/proj.linux/Makefile @@ -50,7 +50,7 @@ SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex endif -SHAREDLIBS += -lglfw -lGL +SHAREDLIBS += -lglfw #SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) #SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib diff --git a/samples/Cpp/TestCpp/proj.linux/Makefile b/samples/Cpp/TestCpp/proj.linux/Makefile index 68f1c1e439..d092925e43 100644 --- a/samples/Cpp/TestCpp/proj.linux/Makefile +++ b/samples/Cpp/TestCpp/proj.linux/Makefile @@ -155,7 +155,7 @@ SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex endif -SHAREDLIBS += -lglfw -lGL +SHAREDLIBS += -lglfw #SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) #SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib