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

Fixed compilation errors for linux port.

This commit is contained in:
James 2013-01-22 15:21:37 +08:00
parent ca5e7b45b1
commit 680fbe3517
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/proj.linux/Makefile
View File

@ -168,7 +168,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libtiff.a $(STATICLIBS_DIR)/libtiff.a
SHAREDLIBS = 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 += -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

2
make-all-linux-project.sh
View File

@ -29,6 +29,8 @@ if ! test -d $DIR_GLEW170/glew-1.7.0/; then
DEPENDS+=' libcurl4-gnutls-dev' DEPENDS+=' libcurl4-gnutls-dev'
DEPENDS+=' libfontconfig1-dev' DEPENDS+=' libfontconfig1-dev'
DEPENDS+=' libsqlite3-dev' DEPENDS+=' libsqlite3-dev'
DEPENDS+=' glew-dev'
for i in $DEPENDS; do for i in $DEPENDS; do
echo -e $TXTCOLOR_GREEN"sudo apt-get install $i, please enter your password:"$TXTCOLOR_DEFAULT echo -e $TXTCOLOR_GREEN"sudo apt-get install $i, please enter your password:"$TXTCOLOR_DEFAULT
sudo apt-get install $i sudo apt-get install $i

2
samples/Cpp/HelloCpp/proj.linux/Makefile
View File

@ -50,7 +50,7 @@ SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
endif endif
SHAREDLIBS += -lglfw -lGL SHAREDLIBS += -lglfw
#SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ #SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/
SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR)
#SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib #SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib

2
samples/Cpp/TestCpp/proj.linux/Makefile
View File

@ -155,7 +155,7 @@ SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
endif endif
SHAREDLIBS += -lglfw -lGL SHAREDLIBS += -lglfw
#SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ #SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/
SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR)
#SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib #SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib