From 6510d41c2c88fe8dcd46a8b4b8c182a1391c9adc Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Fri, 29 Aug 2014 12:39:15 -0700
Subject: [PATCH] Emscripten fix

---
 include.xml                   | 6 ++----
 project/Build.xml             | 4 ++--
 project/src/system/System.cpp | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include.xml b/include.xml
index a0bd5d612..9559de977 100644
--- a/include.xml
+++ b/include.xml
@@ -20,8 +20,6 @@
 		
 		<ndll name="lime" if="included" />
 		
-		<ndll name="libfreetype" register="false" if="emscripten" />
-		
 		<ndll name="curl_ssl" register="false" if="ios" />
 		<ndll name="png" register="false" if="ios" />
 		<ndll name="jpeg" register="false" if="ios" />
@@ -44,9 +42,9 @@
 		<target name="console-pc" handler="lime-console-pc" />
 		<haxelib name="lime-console-pc" if="console-pc" />
 		
-		<haxedef name="lime-curl" unless="lime-console" />
+		<haxedef name="lime-curl" unless="lime-console || emscripten" />
 		<haxedef name="lime-opengl" unless="lime-console" />
-		<haxedef name="lime-openal" unless="lime-console || static_link" />
+		<haxedef name="lime-openal" unless="lime-console || static_link || emscripten" />
 		
 	</section>
 	
diff --git a/project/Build.xml b/project/Build.xml
index 0d207980a..89d895148 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -8,13 +8,13 @@
 	
 	<set name="ios" value="1" if="iphone" />
 	
-	<set name="LIME_CURL" value="1" />
+	<set name="LIME_CURL" value="1" unless="emscripten" />
 	<set name="LIME_JPEG" value="1" />
 	<set name="LIME_FREETYPE" value="1" />
 	<set name="LIME_HARFBUZZ" value="1" />
 	<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
 	<set name="LIME_OGG" value="1" />
-	<set name="LIME_OPENAL" value="1" unless="android" />
+	<set name="LIME_OPENAL" value="1" unless="android || emscripten" />
 	<set name="LIME_OPENGL" value="1" />
 	<set name="LIME_PNG" value="1" />
 	<set name="LIME_SDL" value="1" />
diff --git a/project/src/system/System.cpp b/project/src/system/System.cpp
index 422414be5..575eff845 100644
--- a/project/src/system/System.cpp
+++ b/project/src/system/System.cpp
@@ -104,7 +104,7 @@ namespace lime {
 		#elif defined (GPH) || defined (HX_LINUX) || defined (EMSCRIPTEN)
 		
 		struct timeval tv;
-		if (gettimeofday (&tv, NULL))
+		if (gettimeofday (&tv, 0))
 			return 0;
 		double t = (tv.tv_sec + ((double)tv.tv_usec) / 1000000.0);