diff --git a/Makefile b/Makefile
index 21d5370d05..0bc9522bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,11 @@ ifeq ($(COMPILE_PLATFORM),cygwin)
   PLATFORM=mingw32
 endif
 
+# detect "emmake make"
+ifeq ($(findstring /emcc,$(CC)),/emcc)
+  PLATFORM=emscripten
+endif
+
 ifndef PLATFORM
 PLATFORM=$(COMPILE_PLATFORM)
 endif
@@ -1062,9 +1067,9 @@ ifeq ($(PLATFORM),emscripten)
   USE_RENDERER_DLOPEN=0
 
   BASE_CFLAGS=-fPIC -s USE_SDL=2
-  LDFLAGS=-s TOTAL_MEMORY=256mb -s MAX_WEBGL_VERSION=2 --preload-file $(BASEGAME)
+  LDFLAGS=-s STACK_SIZE=5MB -s TOTAL_MEMORY=256MB -s MAX_WEBGL_VERSION=2 --preload-file $(BASEGAME)
   OPTIMIZEVM = -O3
-  OPTIMIZE = $(OPTIMIZEVM)
+  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   FULLBINEXT=.html