Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from minggo/update-curl 

Update curl
This commit is contained in:
James Chen 2012-10-29 00:11:54 -07:00
parent 45783574fd 5aad6eeb9b
commit 25a858ae2b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
a485f5e235eab19953e38764652f50a60556d755 62d3069171e474ac720640f58c31cac4d312a2c9

1
cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.so.REMOVED.git-id vendored
View File

@ -1 +0,0 @@
b76eb018f78af561dcc72e78f477c6b6233f4298

16
samples/HelloCpp/proj.linux/Makefile
View File

@ -41,9 +41,21 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libtiff.a \ $(STATICLIBS_DIR)/libtiff.a \
# $(STATICLIBS_DIR)/libGLEW.a \ # $(STATICLIBS_DIR)/libGLEW.a \
SHAREDLIBS = -lglfw -lcurl SHAREDLIBS =
SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib 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 += -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 $<) #$(shell ../../build-linux.sh $<)