From 5000fa42c0520d9cec150e51e3d91ff2ef9dc4ae Mon Sep 17 00:00:00 2001
From: Joshua Granick <joshua@joshuagranick.com>
Date: Thu, 26 Dec 2013 16:53:58 -0800
Subject: [PATCH] Emscripten fixes

---
 project/Build.xml                             |  4 ++--
 project/src/platform/blackberry/System.cpp    |  6 +++---
 project/src/platform/emscripten/System.cpp    | 14 ++++++++++++++
 project/src/renderer/opengl/OGLExport.cpp     |  2 ++
 project/src/renderer/opengl/OpenGLContext.cpp |  4 ++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 0cefdbaf4..41d4a5f0a 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -537,8 +537,8 @@
 		<lib name="${THIRDPARTY_LIBS}libz${name_extra}${SLIBEXT}" if="linux" unless="dynamic_sdl"/>
 		<lib name="${THIRDPARTY_LIBS}libz${name_extra}${SLIBEXT}" if="tizen" />
 		
-		<lib name="${THIRDPARTY_LIBS}libSDL_mixer${name_extra}${SLIBEXT}" if="sdl" unless="dynamic_sdl" />
-		<lib name="${THIRDPARTY_LIBS}libSDL_image${name_extra}${SLIBEXT}" if="sdl_image" unless="emscripten" />
+		<lib name="${THIRDPARTY_LIBS}libSDL_mixer${name_extra}${SLIBEXT}" if="sdl" unless="dynamic_sdl || emscripten" />
+		<lib name="${THIRDPARTY_LIBS}libSDL_image${name_extra}${SLIBEXT}" if="sdl_image" unless="dynamic_sdl || emscripten" />
 		<lib name="${THIRDPARTY_LIBS}libSDL${name_extra}${SLIBEXT}" if="sdl_static" unless="blackberry" />
 		<lib name="${THIRDPARTY_LIBS}libSDL2${name_extra}${SLIBEXT}" if="sdl2" />
 		<!-- <lib name="${THIRDPARTY_LIBS}libSDL2main${name_extra}${SLIBEXT}" if="windows" unless="sdl" /> -->
diff --git a/project/src/platform/blackberry/System.cpp b/project/src/platform/blackberry/System.cpp
index 757d6bdc0..7713ea3f4 100644
--- a/project/src/platform/blackberry/System.cpp
+++ b/project/src/platform/blackberry/System.cpp
@@ -113,13 +113,13 @@ namespace lime {
 	std::string FileDialogFolder( const std::string &title, const std::string &text ) {
 		return ""; 
 	}
-
+	
 	std::string FileDialogOpen( const std::string &title, const std::string &text, const std::vector<std::string> &fileTypes ) { 
 		return ""; 
 	}
-
+	
 	std::string FileDialogSave( const std::string &title, const std::string &text, const std::vector<std::string> &fileTypes ) { 
 		return ""; 
-	}    
+	}
 
 }
diff --git a/project/src/platform/emscripten/System.cpp b/project/src/platform/emscripten/System.cpp
index 4a420bc41..a7f88f5a7 100644
--- a/project/src/platform/emscripten/System.cpp
+++ b/project/src/platform/emscripten/System.cpp
@@ -1,5 +1,6 @@
 #include <string>
 #include <cstdlib>
+#include <vector>
 
 namespace lime {
 	
@@ -73,5 +74,18 @@ namespace lime {
 		
 	}
 	
+	
+	std::string FileDialogFolder( const std::string &title, const std::string &text ) {
+		return ""; 
+	}
+	
+	std::string FileDialogOpen( const std::string &title, const std::string &text, const std::vector<std::string> &fileTypes ) { 
+		return ""; 
+	}
+	
+	std::string FileDialogSave( const std::string &title, const std::string &text, const std::vector<std::string> &fileTypes ) { 
+		return ""; 
+	}
+	
 
 }
\ No newline at end of file
diff --git a/project/src/renderer/opengl/OGLExport.cpp b/project/src/renderer/opengl/OGLExport.cpp
index 85579acab..18588eb0f 100644
--- a/project/src/renderer/opengl/OGLExport.cpp
+++ b/project/src/renderer/opengl/OGLExport.cpp
@@ -65,7 +65,9 @@ DEFINE_PRIM(lime_gl_enable,1);
 
 value lime_gl_disable(value inCap)
 {
+   #ifndef LIME_FORCE_GLES2
    glDisable(val_int(inCap));
+   #endif
    return alloc_null();
 }
 DEFINE_PRIM(lime_gl_disable,1);
diff --git a/project/src/renderer/opengl/OpenGLContext.cpp b/project/src/renderer/opengl/OpenGLContext.cpp
index fc49bd9c2..bf86b231c 100644
--- a/project/src/renderer/opengl/OpenGLContext.cpp
+++ b/project/src/renderer/opengl/OpenGLContext.cpp
@@ -238,10 +238,12 @@ namespace lime {
 	
 	void OpenGLContext::FinishBitmapRender () {
 		
+		#ifndef LIME_FORCE_GLES2
 		glDisable (GL_TEXTURE_2D);
 		#ifdef LIME_DITHER
 		glEnable (GL_DITHER);
 		#endif
+		#endif
 		
 	}
 	
@@ -455,10 +457,12 @@ namespace lime {
 				if (boundTexture) {
 					
 					boundTexture->BindFlags (draw.mBitmapRepeat, draw.mBitmapSmooth);
+					#ifndef LIME_FORCE_GLES2
 					#ifdef LIME_DITHER
 					if (!inSmooth)
 						glDisable (GL_DITHER);
 					#endif
+					#endif
 					
 				} else {