diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-02-15 10:30:29 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-02-15 10:30:29 +0100 |
| commit | 86819cc9f827b02da8cc44cc14bce7bc81ab5e9b (patch) | |
| tree | 22c9b0678a21168a6b92b8fff4b05f1279feaabd /Makefile | |
| parent | ec05242c27754224c8dd5d8c60828a0b43ef8f4c (diff) | |
Fixed default EMCCFLAGS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -95,16 +95,19 @@ CXXFLAGS += -std=gnu++0x -Os else ifeq ($(CONFIG),emcc) CXX = emcc -CXXFLAGS += -std=c++11 -Os -Wno-warn-absolute-paths -CXXFLAGS := $(filter-out -ggdb,$(CXXFLAGS)) -EMCCFLAGS := -s ALLOW_MEMORY_GROWTH=1 -EMCCFLAGS += -s DISABLE_EXCEPTION_CATCHING=0 +CXXFLAGS := -std=c++11 $(filter-out -ggdb,$(CXXFLAGS)) +EMCCFLAGS := -Os -Wno-warn-absolute-paths +EMCCFLAGS += --memory-init-file 0 +# https://github.com/kripken/emscripten/blob/master/src/settings.js +# EMCCFLAGS += -s ALLOW_MEMORY_GROWTH=1 +# EMCCFLAGS += -s DISABLE_EXCEPTION_CATCHING=0 +# EMCCFLAGS += -s AGGRESSIVE_VARIABLE_ELIMINATION=1 # EMCCFLAGS += -s ASSERTIONS=2 # EMCCFLAGS += -s SAFE_HEAP=1 # EMCCFLAGS += -s RELOOP=0 -# EMCCFLAGS += -g4 CXXFLAGS += $(EMCCFLAGS) LDFLAGS += $(EMCCFLAGS) +LDLIBS = EXE = .html else ifeq ($(CONFIG),mxe) |