From a89279d1b7746730e9c5e7724b13e1d65e48c6ed Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:17:35 -0700
Subject: [PATCH] Emscripten fixes

---
 project/Build.xml                 | 6 +++---
 project/src/ExternalInterface.cpp | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 42f84fedc..aaa0f08c9 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -23,9 +23,9 @@
 	<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
 	<set name="LIME_OGG" value="1" />
 	<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
-	<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" />
-	<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
 	<set name="LIME_OPENAL" value="1" if="mac || iphone || emscripten || tvos" />
+	<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" unless="LIME_OPENAL" />
+	<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
 	<set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" />
 	<set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" />
 	<set name="LIME_OPENGL" value="1" />
@@ -36,7 +36,7 @@
 	<set name="LIME_SDL_ANGLE" value="1" if="windows LIME_SDL_ANGLE" unless="static_link" />
 	<set name="LIME_SDL_ANGLE" value="1" if="windows angle" unless="static_link" />
 	<set name="LIME_SDL_ANGLE" value="1" if="winrt" unless="static_link" />
-	<set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" unless="winrt" />
+	<set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" unless="winrt || emscripten" />
 	<set name="LIME_VORBIS" value="1" />
 	<!-- <set name="LIME_VPX" value="1" />
 	<set name="LIME_WEBM" value="1" /> -->
diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
index 48aa00dce..1ab94b197 100644
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -704,7 +704,6 @@ namespace lime {
 
 	HL_PRIM vbyte* hl_lime_file_dialog_open_directory (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
 
-		#ifndef EMSCRIPTEN
 		#ifdef LIME_TINYFILEDIALOGS
 
 		std::wstring* _title = hxstring_to_wstring (title);
@@ -732,7 +731,6 @@ namespace lime {
 
 		}
 
-		#endif
 		#endif
 
 		return NULL;
@@ -775,7 +773,6 @@ namespace lime {
 
 	HL_PRIM vbyte* hl_lime_file_dialog_open_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
 
-		#ifndef EMSCRIPTEN
 		#ifdef LIME_TINYFILEDIALOGS
 
 		std::wstring* _title = hxstring_to_wstring (title);
@@ -803,7 +800,6 @@ namespace lime {
 
 		}
 
-		#endif
 		#endif
 
 		return NULL;
@@ -846,7 +842,6 @@ namespace lime {
 
 	HL_PRIM hl_varray* hl_lime_file_dialog_open_files (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
 
-		#ifndef EMSCRIPTEN
 		#ifdef LIME_TINYFILEDIALOGS
 
 		std::wstring* _title = hxstring_to_wstring (title);
@@ -877,7 +872,6 @@ namespace lime {
 		#else
 		hl_varray* result = hl_alloc_array (&hlt_bytes, 0);
 		#endif
-		#endif
 
 		return result;
 
@@ -919,7 +913,6 @@ namespace lime {
 
 	HL_PRIM vbyte* hl_lime_file_dialog_save_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
 
-		#ifndef EMSCRIPTEN
 		#ifdef LIME_TINYFILEDIALOGS
 
 		std::wstring* _title = hxstring_to_wstring (title);
@@ -947,7 +940,6 @@ namespace lime {
 
 		}
 
-		#endif
 		#endif
 
 		return NULL;