build: activate ALLOW_MEMORY_GROWTH on emscripten builds and work around

a bug in emcc that won’t let us discover SDL.h.

build/lol-build

@@ -91,9 +91,6 @@ __init__()
     WINEDLLOVERRIDES="winemenubuilder.exe,wineboot.exe,explorer.exe,winedbg.exe=d"
     export WINEDLLOVERRIDES
 
-    LLVM_ADD_VERSION=3.0
-    export LLVM_ADD_VERSION
-
     # Ensure SDL does not redirect stdout/stderr to local files
     SDL_STDIO_REDIRECT=0
     export SDL_STDIO_REDIRECT
@@ -239,8 +236,7 @@ configure()
             PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
             ;;
         emscripten-*)
-            EM_HOME=$HOME/emscripten
-            ./configure CC=$EM_HOME/emcc CXX=$EM_HOME/em++ AR=$EM_HOME/emar RANLIB=$EM_HOME/emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##emscripten-}"
+            ./configure CC=emcc CXX=em++ AR=emar RANLIB=emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##emscripten-}"
             ;;
         *)
             PATH="$PATH" ./configure CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS"

configure.ac

@@ -247,6 +247,19 @@ LOL_TRY_CXXFLAGS(-mwindows -mwin32,
   LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"])
 
 
+dnl  Are we building using Emscripten?
+ac_cv_my_have_emscripten="no"
+AC_CHECK_HEADERS(emscripten.h,
+ [ac_cv_my_have_emscripten="yes"
+  AM_CXXFLAGS="${AM_CXXFLAGS} -s ALLOW_MEMORY_GROWTH=1"
+  dnl  HACK: until emcc properly adds these to EMSDK_OPTS
+  CPPFLAGS="${CPPFLAGS} -U__i386__ -U__x86_64__ -U__i386 -U__x86_64 -Ui386 -Ux86_64"
+  CPPFLAGS="${CPPFLAGS} -U__SSE__ -U__SSE2__ -U__MMX__ -UX87_DOUBLE_ROUNDING"
+  CPPFLAGS="${CPPFLAGS} -UHAVE_GCC_ASM_FOR_X87 -DEMSCRIPTEN -U__STRICT_ANSI__"
+  CPPFLAGS="${CPPFLAGS} -U__CYGWIN__"])
+AM_CONDITIONAL(USE_EMSCRIPTEN, test "${ac_cv_my_have_emscripten}" != "no")
+
+
 dnl  Are we on the Xbox 360?
 dnl  Answer: NO! we don't know how to build for it anyway
 AM_CONDITIONAL(USE_X360, false)
@@ -309,13 +322,6 @@ AC_LANG_POP(C++)
 AM_CONDITIONAL(USE_NACL, test "${ac_cv_my_have_nacl}" != "no")
 
 
-dnl  Use Emscripten?
-ac_cv_my_have_emscripten="no"
-AC_CHECK_HEADERS(emscripten.h,
- [ac_cv_my_have_emscripten="yes"])
-AM_CONDITIONAL(USE_EMSCRIPTEN, test "${ac_cv_my_have_emscripten}" != "no")
-
-
 dnl  Use Android? FIXME: super hacks!
 ac_cv_my_have_android="no"
 AC_CHECK_LIB(log, __android_log_vprint,