From 333535dcf33307a1ea58b9c330774447ca628c1f Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Fri, 27 Feb 2015 13:17:53 +0000
Subject: [PATCH] glshim: added glx/lookup.c to compilation

---
 project/jni/glshim/Android.mk       |  1 +
 project/jni/glshim/src/glx/lookup.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/project/jni/glshim/Android.mk b/project/jni/glshim/Android.mk
index 86c098937..ef0cfa613 100644
--- a/project/jni/glshim/Android.mk
+++ b/project/jni/glshim/Android.mk
@@ -38,6 +38,7 @@ LOCAL_SRC_FILES := \
 	src/gl/wrap/glesext.c \
 	src/gl/wrap/glstub.c \
 	src/gl/math/eval.c \
+	src/glx/lookup.c \
 	src/glx/streaming.c
 
 LOCAL_CFLAGS += -g -std=c99 -funwind-tables -O3 -DBCMHOST
diff --git a/project/jni/glshim/src/glx/lookup.c b/project/jni/glshim/src/glx/lookup.c
index caa07b8aa..ba69a3941 100755
--- a/project/jni/glshim/src/glx/lookup.c
+++ b/project/jni/glshim/src/glx/lookup.c
@@ -1,4 +1,11 @@
+#ifdef ANDROID
+#include "../gl/gl.h"
+#include <android/log.h>
+#else
 #include "glx.h"
+#endif
+
+
 
 #define MAP(func_name, func) \
     if (strcmp(name, func_name) == 0) return (void *)func;
@@ -31,6 +38,7 @@ void *glXGetProcAddressARB(const char *name) {
     #include "glesfuncs.inc"
 #endif
 
+#ifndef ANDROID
     // glX calls
     EX(glXChooseVisual);
     EX(glXCopyContext);
@@ -66,7 +74,8 @@ void *glXGetProcAddressARB(const char *name) {
     EX(glXGetVisualFromFBConfig);
     EX(glXCreateWindow);
     EX(glXDestroyWindow);
-
+#endif
+    
     // GL_ARB_vertex_buffer_object
     ARB(glBindBuffer);
     ARB(glBufferData);
@@ -436,7 +445,11 @@ void *glXGetProcAddressARB(const char *name) {
     STUB(glIndexPointerEXT);
     STUB(glIndexPointer);
 
+#ifdef ANDROID
+    __android_log_print(ANDROID_LOG_INFO, "glshim","glXGetProcAddress: %s not found.\n", name);
+#else    
     printf("glXGetProcAddress: %s not found.\n", name);
+#endif
     return NULL;
 }