From 6ca7c9230381d95af310abaeeb998f6f46418884 Mon Sep 17 00:00:00 2001 From: Spoike Date: Wed, 31 Jul 2013 05:08:33 +0000 Subject: [PATCH] asm_js generates bad javascript. disable it. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4448 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 4a739d166..812072505 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1123,8 +1123,8 @@ ifeq ($(FTE_TARGET),web) ASMJS_MEMORY?=536870912 #512mb (required for asm.js) 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 -# RELEASE_LDFLAGS=-O1 $(WEB_PREJS) -s TOTAL_MEMORY=$(WEB_MEMORY) --js-library web/ftejslib.js --shell-file web/fteshell.html +# RELEASE_LDFLAGS=-s ASM_JS=1 -O2 $(WEB_PREJS) -s TOTAL_MEMORY=$(ASMJS_MEMORY) --js-library web/ftejslib.js --shell-file web/fteshell.html + RELEASE_LDFLAGS=-O1 $(WEB_PREJS) -s TOTAL_MEMORY=$(WEB_MEMORY) --js-library web/ftejslib.js --shell-file web/fteshell.html DEBUG_LDLAGS=-O0 $(WEB_PREJS) -s TOTAL_MEMORY=$(WEB_MEMORY) --js-library web/ftejslib.js CC=emcc #BASELDFLAGS=