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

fix js and linux compile error

This commit is contained in:
boyu0 2013-08-07 10:34:30 +08:00
parent eb989db3de
commit ec6343a9b8
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/proj.linux/cocos2dx.mk
View File

@ -57,7 +57,6 @@ INCLUDES += \
-I$(COCOS_SRC)/include \ -I$(COCOS_SRC)/include \
-I$(COCOS_SRC)/kazmath/include \ -I$(COCOS_SRC)/kazmath/include \
-I$(COCOS_SRC)/platform/linux \ -I$(COCOS_SRC)/platform/linux \
-I$(COCOS_SRC)/platform/third_party/linux/libpng \
-I$(COCOS_SRC)/platform/third_party/linux/libjpeg \ -I$(COCOS_SRC)/platform/third_party/linux/libjpeg \
-I$(COCOS_SRC)/platform/third_party/linux/libtiff \ -I$(COCOS_SRC)/platform/third_party/linux/libtiff \
-I$(COCOS_SRC)/platform/third_party/linux/libwebp -I$(COCOS_SRC)/platform/third_party/linux/libwebp
@ -107,7 +106,6 @@ else
STATICLIBS_DIR = $(COCOS_SRC)/platform/third_party/linux/libraries STATICLIBS_DIR = $(COCOS_SRC)/platform/third_party/linux/libraries
endif endif
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libtiff.a \ $(STATICLIBS_DIR)/libtiff.a \
$(STATICLIBS_DIR)/libwebp.a $(STATICLIBS_DIR)/libwebp.a

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
e7d44ce7f120b3a7eaabe8079dfee33b25fdf284 a9b4d7898c51c7cc4c1e53fde4695cf85e32d796

2
scripting/javascript/bindings/generated

@ -1 +1 @@
Subproject commit ea5aa5e297dc1bb4091960cbacb001748391603b Subproject commit bb8785677a66951bc0bc211c91f555727583b6a2