diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile index cb43147482..4129383b12 100644 --- a/cocos2dx/proj.linux/Makefile +++ b/cocos2dx/proj.linux/Makefile @@ -189,14 +189,13 @@ STATICLIBS_DIR = ../platform/third_party/linux/libraries endif STATICLIBS = STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ - $(STATICLIBS_DIR)/libcurl.a \ $(STATICLIBS_DIR)/libxml2.a \ $(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libtiff.a \ SHAREDLIBS = -SHAREDLIBS += -lglfw -lGL +SHAREDLIBS += -lglfw -lGL -lcurl 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/create-qnx-project.sh b/create-qnx-project.sh old mode 100644 new mode 100755 index 9b1deb070a..7d2c9be4c1 --- a/create-qnx-project.sh +++ b/create-qnx-project.sh @@ -54,7 +54,7 @@ copy_resouces(){ # replace string modify_file_content(){ # here should use # instead of /, why?? - sed "s#$2#$3#" $PROJECT_DIR/proj.blackberry/$1 > $PROJECT_DIR/proj.blackberry/tmp.txt + sed "s#$2#$3#g" $PROJECT_DIR/proj.blackberry/$1 > $PROJECT_DIR/proj.blackberry/tmp.txt rm $PROJECT_DIR/proj.blackberry/$1 mv $PROJECT_DIR/proj.blackberry/tmp.txt $PROJECT_DIR/proj.blackberry/$1 } @@ -82,4 +82,4 @@ create_qnx_project(){ echo "Congratulations, the '$PROJECT_NAME' project have been created successfully, please use QNX IDE to import the project!" } -create_qnx_project \ No newline at end of file +create_qnx_project diff --git a/make-all-linux-project.sh b/make-all-linux-project.sh index 4fe277fc65..32500f679f 100755 --- a/make-all-linux-project.sh +++ b/make-all-linux-project.sh @@ -25,6 +25,7 @@ if ! test -d $DIR_GLEW170/glew-1.7.0/; then DEPENDS+=' libglfw-dev' DEPENDS+=' g++' DEPENDS+=' libzip-dev' + DEPENDS+=' libcurl4-gnutls-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/HelloCpp/proj.linux/Makefile b/samples/HelloCpp/proj.linux/Makefile index 7d5c324fc0..2c5475a2ad 100644 --- a/samples/HelloCpp/proj.linux/Makefile +++ b/samples/HelloCpp/proj.linux/Makefile @@ -35,7 +35,6 @@ STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries endif STATICLIBS = STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ - $(STATICLIBS_DIR)/libcurl.a \ $(STATICLIBS_DIR)/libxml2.a \ $(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libjpeg.a \ @@ -44,7 +43,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ SHAREDLIBS = -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../lib/linux/Debug/ -SHAREDLIBS += -lglfw +SHAREDLIBS += -lglfw -lcurl 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/samples/TestCpp/proj.linux/Makefile b/samples/TestCpp/proj.linux/Makefile index 83316f7abe..5ef583cbc3 100644 --- a/samples/TestCpp/proj.linux/Makefile +++ b/samples/TestCpp/proj.linux/Makefile @@ -153,7 +153,7 @@ SHAREDLIBS += -Wl,-rpath,../../../cocos2dx/platform/third_party/linux/glew-1.7.0 SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW SHAREDLIBS += -Wl,-rpath,$(STATICLIBS_DIR) -SHAREDLIBS += -L$(STATICLIBS_DIR) -lcurl +SHAREDLIBS += -lcurl ####### Build rules diff --git a/samples/TestJavascript/proj.linux/Makefile b/samples/TestJavascript/proj.linux/Makefile index 18b19ff5f2..87f64720de 100644 --- a/samples/TestJavascript/proj.linux/Makefile +++ b/samples/TestJavascript/proj.linux/Makefile @@ -56,8 +56,8 @@ SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex endif SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../lib/linux/Debug/ -SHAREDLIBS += -lglfw -#SHAREDLIBS += -lGLEW +SHAREDLIBS += -lglfw -lcurl +#SHAREDLIBS += -lGLEW SHAREDLIBS += -Wl,-rpath,$(SHAREDLIBS_DIR) 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