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

Switch makefile over to using Emscripten headers for freetype.

This commit is contained in:
James Gregory 2013-04-08 21:09:53 -07:00
parent 1ef5b398f9
commit a807ee97d3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,11 @@ PACKAGER := $(realpath $(COCOS_ROOT)/external/emscripten/tools/file_packager.py)
CC := $(COCOS_ROOT)/external/emscripten/emcc CC := $(COCOS_ROOT)/external/emscripten/emcc
CXX := $(COCOS_ROOT)/external/emscripten/em++ CXX := $(COCOS_ROOT)/external/emscripten/em++
AR := $(COCOS_ROOT)/external/emscripten/emar AR := $(COCOS_ROOT)/external/emscripten/emar
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1
CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1
ARFLAGS = cr ARFLAGS = cr
LIB_DIR = $(COCOS_SRC)/lib/linux LIB_DIR = $(COCOS_SRC)/lib/emscripten
BIN_DIR = bin BIN_DIR = bin
INCLUDES += \ INCLUDES += \
@ -31,6 +31,7 @@ INCLUDES += \
-I$(COCOS_SRC)/platform/emscripten \ -I$(COCOS_SRC)/platform/emscripten \
-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/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/libtiff/include \
-I$(COCOS_SRC)/platform/third_party/linux/libwebp -I$(COCOS_SRC)/platform/third_party/linux/libwebp