From 929fafa7a107e9e3d4268b44b6588729a87bd502 Mon Sep 17 00:00:00 2001
From: Sergey Lipskiy <gonetz@ngs.ru>
Date: Mon, 13 Oct 2014 19:38:51 +0700
Subject: [PATCH] Fix Mac OS X compilation errors.

---
 DepthBuffer.cpp |  4 ++++
 GLSLCombiner.h  |  9 +++++++++
 OpenGL.h        |  1 +
 Shaders.h       | 19 +++++++------------
 Textures.h      |  2 ++
 winlnxdefs.h    |  1 -
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/DepthBuffer.cpp b/DepthBuffer.cpp
index 4da716ae..8354aa6d 100644
--- a/DepthBuffer.cpp
+++ b/DepthBuffer.cpp
@@ -1,4 +1,8 @@
+#ifdef OS_MAC_OS_X
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include <assert.h>
 #include "OpenGL.h"
 #include "Combiner.h"
diff --git a/GLSLCombiner.h b/GLSLCombiner.h
index 45e66f6a..6fa2fb63 100644
--- a/GLSLCombiner.h
+++ b/GLSLCombiner.h
@@ -54,6 +54,15 @@ private:
 		iv2Uniform uCacheFrameBuffer;
 	};
 
+#ifdef OS_MAC_OS_X
+#define glUniform1i glUniform1iARB
+#define glUniform1f glUniform1fARB
+#define glUniform2f glUniform2fARB
+#define glUniform2i glUniform2iARB
+#define glUniform3fv glUniform3fvARB
+#define glUniform4fv glUniform4fvARB
+#endif
+
 	void _locate_attributes() const;
 	void _locateUniforms();
 	void _setIUniform(iUniform & _u, int _val, bool _force) {
diff --git a/OpenGL.h b/OpenGL.h
index 57d450cd..ad5c3b39 100644
--- a/OpenGL.h
+++ b/OpenGL.h
@@ -19,6 +19,7 @@
 #define GL_GLEXT_PROTOTYPES
 #if defined(OS_MAC_OS_X)
 #include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #elif defined(OS_LINUX)
 #include <GL/gl.h>
diff --git a/Shaders.h b/Shaders.h
index caec0c2b..8e097be6 100644
--- a/Shaders.h
+++ b/Shaders.h
@@ -309,13 +309,6 @@ static const char* fragment_shader_toonify =
 ;
 #endif
 
-static const char* fragment_shader_default =
-//"  gl_FragColor = texture2D(uTex0, gl_TexCoord[0].st); \n"
-//"  gl_FragColor = gl_Color; \n"
-"  vec4 color = texture2D(uTex0, vTexCoord0); \n"
-"  gl_FragColor = vShadeColor*color; \n"
-;
-
 #ifdef GLES2
 static const char* fragment_shader_readtex0color =
 "  lowp vec4 readtex0 = texture2D(uTex0, vTexCoord0);						\n"
@@ -344,6 +337,11 @@ static const char* fragment_shader_readtex1color =
 "  if (uFbFixedAlpha == 2 || uFbFixedAlpha == 3) readtex1.a = 0.825;	\n"
 ;
 
+static const char* fragment_shader_end =
+"}                               \n"
+#endif
+;
+
 static const char* fragment_shader_mipmap =
 #ifdef GLES2
 "uniform lowp int uEnableLod;		\n"
@@ -482,11 +480,7 @@ static const char* fragment_shader_mipmap =
 #endif
 ;
 
-static const char* fragment_shader_end =
-"}                               \n"
-#endif
-;
-
+#ifdef GL_IMAGE_TEXTURES_SUPPORT
 static const char* depth_compare_shader_float =
 "#version 420 core			\n"
 "uniform int uEnableDepth;	\n"
@@ -577,3 +571,4 @@ static const char* shadow_map_fragment_shader_float =
 "  gl_FragColor = vec4(uFogColor.rgb, get_alpha());	\n"
 "}														\n"
 ;
+#endif // GL_IMAGE_TEXTURES_SUPPORT
diff --git a/Textures.h b/Textures.h
index 9ceca7d6..2ed6196a 100644
--- a/Textures.h
+++ b/Textures.h
@@ -3,6 +3,8 @@
 
 #ifdef ANDROID
 #include <GLES2/gl2.h>
+#elif defined (OS_MAC_OS_X)
+#include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>
 #endif //ANDROID
diff --git a/winlnxdefs.h b/winlnxdefs.h
index a6ba9972..2255194e 100644
--- a/winlnxdefs.h
+++ b/winlnxdefs.h
@@ -30,7 +30,6 @@
 #ifndef WINLNXDEFS_H
 #define WINLNXDEFS_H
 
-#include <features.h>	// we want GNU extensions
 #include <dlfcn.h>
 #include <errno.h>
 #include <limits.h> // PATH_MAX