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

Add libtiff to Emscripten builds, plus some build flags.

This commit is contained in:
James Gregory 2013-04-23 22:45:05 -07:00
parent cb9c5688b2
commit 0eb12121c6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocos2dx/proj.emscripten/cocos2dx.mk
View File

@ -32,23 +32,23 @@ INCLUDES += \
-I$(COCOS_SRC)/platform/third_party/emscripten/libpng \ -I$(COCOS_SRC)/platform/third_party/emscripten/libpng \
-I$(COCOS_SRC)/platform/third_party/emscripten/libz \ -I$(COCOS_SRC)/platform/third_party/emscripten/libz \
-I$(COCOS_SRC)/platform/third_party/emscripten/libfreetype2 \ -I$(COCOS_SRC)/platform/third_party/emscripten/libfreetype2 \
-I$(COCOS_SRC)/platform/third_party/emscripten/libtiff/include \
-I$(COCOS_SRC)/platform/third_party/linux/libjpeg \ -I$(COCOS_SRC)/platform/third_party/linux/libjpeg \
-I$(COCOS_SRC)/platform/third_party/linux/libtiff/include \
-I$(COCOS_SRC)/platform/third_party/linux/libwebp -I$(COCOS_SRC)/platform/third_party/linux/libwebp
LBITS := $(shell getconf LONG_BIT) LBITS := $(shell getconf LONG_BIT)
INCLUDES += -I$(COCOS_SRC)/platform/third_party/linux INCLUDES += -I$(COCOS_SRC)/platform/third_party/linux
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CCFLAGS += -g3 -O0 CCFLAGS += -g -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache
CXXFLAGS += -g3 -O0 CXXFLAGS += -g -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache
DEFINES += -D_DEBUG -DCOCOS2D_DEBUG=1 DEFINES += -D_DEBUG -DCOCOS2D_DEBUG=1
OBJ_DIR := $(OBJ_DIR)/debug OBJ_DIR := $(OBJ_DIR)/debug
LIB_DIR := $(LIB_DIR)/debug LIB_DIR := $(LIB_DIR)/debug
BIN_DIR := $(BIN_DIR)/debug BIN_DIR := $(BIN_DIR)/debug
else else
CCFLAGS += -O1 CCFLAGS += -O1 --jcache
CXXFLAGS += -O1 CXXFLAGS += -O1 --jcache
DEFINES += -DNDEBUG DEFINES += -DNDEBUG
OBJ_DIR := $(OBJ_DIR)/release OBJ_DIR := $(OBJ_DIR)/release
LIB_DIR := $(LIB_DIR)/release LIB_DIR := $(LIB_DIR)/release
@ -74,9 +74,9 @@ CORE_MAKEFILE_LIST := $(MAKEFILE_LIST)
STATICLIBS_DIR = $(COCOS_SRC)/platform/third_party/emscripten/libraries STATICLIBS_DIR = $(COCOS_SRC)/platform/third_party/emscripten/libraries
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/zlib.a #\ $(STATICLIBS_DIR)/zlib.a \
$(STATICLIBS_DIR)/libtiff.a #\
$(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libtiff.a \
$(STATICLIBS_DIR)/libwebp.a $(STATICLIBS_DIR)/libwebp.a
FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/api/lib FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/api/lib