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

Simplify Emscripten makefile a little.

This commit is contained in:
James Gregory 2013-05-06 20:34:15 -07:00
parent 0a4c4b13ef
commit ce2d97c848
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,10 +11,11 @@ endif
COCOS_SRC = $(COCOS_ROOT)/cocos2dx COCOS_SRC = $(COCOS_ROOT)/cocos2dx
OBJ_DIR ?= obj OBJ_DIR ?= obj
PACKAGER := $(realpath $(COCOS_ROOT)/external/emscripten/tools/file_packager.py) EMSCRIPTEN_ROOT := $(realpath $(COCOS_ROOT)/external/emscripten)
CC := EMSCRIPTEN=$(realpath $(COCOS_ROOT)/external/emscripten) $(COCOS_ROOT)/external/emscripten/emcc PACKAGER := $(EMSCRIPTEN_ROOT)/tools/file_packager.py
CXX := EMSCRIPTEN=$(realpath $(COCOS_ROOT)/external/emscripten) $(COCOS_ROOT)/external/emscripten/em++ CC := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emcc
AR := EMSCRIPTEN=$(realpath $(COCOS_ROOT)/external/emscripten) $(COCOS_ROOT)/external/emscripten/emar CXX := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/em++
AR := EMSCRIPTEN=$(EMSCRIPTEN_ROOT) $(COCOS_ROOT)/external/emscripten/emar
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1 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 -s VERBOSE=1 CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s TOTAL_MEMORY=268435456 -s VERBOSE=1
ARFLAGS = cr ARFLAGS = cr
@ -23,6 +24,7 @@ LIB_DIR = $(COCOS_SRC)/lib/emscripten
BIN_DIR = bin BIN_DIR = bin
INCLUDES += \ INCLUDES += \
-I$(EMSCRIPTEN_ROOT)/system/include \
-I$(COCOS_ROOT)/external/emscripten/system/include \ -I$(COCOS_ROOT)/external/emscripten/system/include \
-I$(COCOS_SRC) \ -I$(COCOS_SRC) \
-I$(COCOS_SRC)/cocoa \ -I$(COCOS_SRC)/cocoa \
@ -79,10 +81,6 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libwebp.a $(STATICLIBS_DIR)/libwebp.a
FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS += -lfmodex
SHAREDLIBS += -L$(FMOD_LIBDIR) -Wl,-rpath,$(RPATH_REL)/$(FMOD_LIBDIR)
SHAREDLIBS += -L$(LIB_DIR) -Wl,-rpath,$(RPATH_REL)/$(LIB_DIR) SHAREDLIBS += -L$(LIB_DIR) -Wl,-rpath,$(RPATH_REL)/$(LIB_DIR)
LIBS = -lrt -lz LIBS = -lrt -lz