From 86819cc9f827b02da8cc44cc14bce7bc81ab5e9b Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 15 Feb 2015 10:30:29 +0100 Subject: [PATCH] Fixed default EMCCFLAGS --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4b004196d..502d2c205 100644 --- a/Makefile +++ b/Makefile @@ -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) -- 2.30.2