Fixed default EMCCFLAGS
authorClifford Wolf <clifford@clifford.at>
Sun, 15 Feb 2015 09:30:29 +0000 (10:30 +0100)
committerClifford Wolf <clifford@clifford.at>
Sun, 15 Feb 2015 09:30:29 +0000 (10:30 +0100)
Makefile

index 4b004196d7a422f45805131894c89dd052edeed9..502d2c205526f45a1b0fea2c8709cc5830cbf412 100644 (file)
--- 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)