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

Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20

This commit is contained in:
James Chen 2012-08-24 16:12:03 +08:00
parent 087341b316 cf1d61f3de
commit 8d55bae974
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos2dx/proj.linux/Makefile
View File

@ -189,14 +189,13 @@ STATICLIBS_DIR = ../platform/third_party/linux/libraries
endif endif
STATICLIBS = STATICLIBS =
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libcurl.a \
$(STATICLIBS_DIR)/libxml2.a \ $(STATICLIBS_DIR)/libxml2.a \
$(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libtiff.a \ $(STATICLIBS_DIR)/libtiff.a \
SHAREDLIBS = 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 += -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

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

@ -25,6 +25,7 @@ if ! test -d $DIR_GLEW170/glew-1.7.0/; then
DEPENDS+=' libglfw-dev' DEPENDS+=' libglfw-dev'
DEPENDS+=' g++' DEPENDS+=' g++'
DEPENDS+=' libzip-dev' DEPENDS+=' libzip-dev'
DEPENDS+=' libcurl4-gnutls-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

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

@ -35,7 +35,6 @@ STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries
endif endif
STATICLIBS = STATICLIBS =
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libcurl.a \
$(STATICLIBS_DIR)/libxml2.a \ $(STATICLIBS_DIR)/libxml2.a \
$(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/libjpeg.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 = -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 += -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
samples/TestCpp/proj.linux/Makefile
View File

@ -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 += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
SHAREDLIBS += -Wl,-rpath,$(STATICLIBS_DIR) SHAREDLIBS += -Wl,-rpath,$(STATICLIBS_DIR)
SHAREDLIBS += -L$(STATICLIBS_DIR) -lcurl SHAREDLIBS += -lcurl
####### Build rules ####### Build rules

2
samples/TestJavascript/proj.linux/Makefile
View File

@ -56,7 +56,7 @@ SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
endif endif
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 += -lglfw SHAREDLIBS += -lglfw -lcurl
#SHAREDLIBS += -lGLEW #SHAREDLIBS += -lGLEW
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