From 078d8e099a36df8667772b2b1524fd339defabcc Mon Sep 17 00:00:00 2001
From: Justin Kerk <dopefishjustin@gmail.com>
Date: Sat, 21 Nov 2015 01:40:59 -0800
Subject: [PATCH] Emscripten build fixes (nw)

---
 makefile                    | 4 ++++
 scripts/src/3rdparty.lua    | 2 +-
 scripts/src/osd/modules.lua | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index f78c443970e..0f380ece13b 100644
--- a/makefile
+++ b/makefile
@@ -327,6 +327,10 @@ endif
 ifeq ($(TARGETOS),os2)
 OSD := sdl
 endif
+
+ifeq ($(TARGETOS),asmjs)
+OSD := sdl
+endif
 endif
 
 #-------------------------------------------------
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index e3d7a6be843..34dc213cc7d 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -371,7 +371,7 @@ end
 		defines {
 			"LUA_COMPAT_ALL",
 		}
-	if not (_OPTIONS["targetos"]=="windows") then
+	if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
 		defines {
 			"LUA_USE_POSIX",
 		}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 1abed7d1e25..cdb376c9c92 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -356,7 +356,7 @@ newoption {
 }
 
 if not _OPTIONS["NO_USE_MIDI"] then
-	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
 		_OPTIONS["NO_USE_MIDI"] = "1"
 	else
 		_OPTIONS["NO_USE_MIDI"] = "0"
@@ -379,7 +379,7 @@ newoption {
 
 
 if not _OPTIONS["USE_QTDEBUG"] then
-	if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+	if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
 		_OPTIONS["USE_QTDEBUG"] = "0"
 	else
 		_OPTIONS["USE_QTDEBUG"] = "1"