diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id index b555f184c2..fb8cc8b545 100644 --- a/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id @@ -1 +1 @@ -a485f5e235eab19953e38764652f50a60556d755 \ No newline at end of file +62d3069171e474ac720640f58c31cac4d312a2c9 \ No newline at end of file diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.so.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.so.REMOVED.git-id deleted file mode 100644 index cade70d7e0..0000000000 --- a/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.so.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b76eb018f78af561dcc72e78f477c6b6233f4298 \ No newline at end of file diff --git a/samples/HelloCpp/proj.linux/Makefile b/samples/HelloCpp/proj.linux/Makefile index 581d1700e3..075553a949 100644 --- a/samples/HelloCpp/proj.linux/Makefile +++ b/samples/HelloCpp/proj.linux/Makefile @@ -41,9 +41,21 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ $(STATICLIBS_DIR)/libtiff.a \ # $(STATICLIBS_DIR)/libGLEW.a \ -SHAREDLIBS = -lglfw -lcurl -SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +SHAREDLIBS = +ifeq ($(LBITS),64) +SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/lib64/api/lib +SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64 +else +SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/api/lib +SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex +endif + +SHAREDLIBS += -lglfw -lGL +#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 SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW +SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib #$(shell ../../build-linux.sh $<)