From 1241494248238b5b636563ae4b3f3e6c1e89b052 Mon Sep 17 00:00:00 2001 From: Spoike Date: Wed, 31 Jul 2013 07:01:34 +0000 Subject: [PATCH] erk, emscripten defaults to asm_js now? o.O I wouldn't mind, but its buggy! git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4449 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/Makefile b/engine/Makefile index 812072505..d940dcb4c 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1119,8 +1119,9 @@ endif ifeq ($(FTE_TARGET),web) WEB_PREJS ?= --pre-js web/prejs.js - WEB_MEMORY?=402653184 #384mb +# WEB_MEMORY?=402653184 #384mb ASMJS_MEMORY?=536870912 #512mb (required for asm.js) + WEB_MEMORY?=$(ASMJS_MEMORY) RELEASE_CFLAGS=-DOMIT_QCC -DGL_STATIC -DFTE_TARGET_WEB DEBUG_CFLAGS=-g --jcache -DOMIT_QCC -DGL_STATIC -DFTE_TARGET_WEB # RELEASE_LDFLAGS=-s ASM_JS=1 -O2 $(WEB_PREJS) -s TOTAL_MEMORY=$(ASMJS_MEMORY) --js-library web/ftejslib.js --shell-file web/fteshell.html