From e1135b6db6e0ecdcba64729e1fcbe1a9a48710ed Mon Sep 17 00:00:00 2001
From: Sylvain Beucler <beuc@beuc.net>
Date: Sat, 17 Mar 2012 16:26:00 +0000
Subject: [PATCH] Fix library for GLES1

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1186 7f0cb862-5218-0410-a997-914c9d46530a
---
 CMakeLists.txt          |   18 ++++++++++++++----
 src/egl/fg_window_egl.c |    4 ++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b39cff..25aadc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ IF(FREEGLUT_GLES2)
   LIST(APPEND LIBS GLESv2 EGL)
 ELSEIF(FREEGLUT_GLES1)
   ADD_DEFINITIONS(-DFREEGLUT_GLES1)
-  LIST(APPEND LIBS GLESv1 EGL)
+  LIST(APPEND LIBS GLESv1_CM EGL)
 ELSE()
   FIND_PACKAGE(OpenGL REQUIRED)
   LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
@@ -363,10 +363,20 @@ ENDIF()
 # Define static build dependencies
 IF(WIN32)
   SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32")
-ELSEIF(ANDROID)
-  SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL")
+ELSEIF(FREEGLUT_GLES2)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL")
+  ENDIF()
+ELSEIF(FREEGLUT_GLES1)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL")
+  ENDIF()
 ELSE()
-  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL")
+  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL")
 ENDIF()
 # Client applications need to define FreeGLUT GLES version to
 # bootstrap headers inclusion in freeglut_std.h:
diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index f88cd8a..a60f952 100644
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -82,7 +82,11 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   }
   EGLint ver = -1;
   eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
+#ifdef GL_ES_VERSION_2_0
   if (ver != 2)
+#else
+  if (ver != 1)
+#endif
     fgError("Wrong GLES major version: %d\n", ver);
 
   return context;
-- 
1.7.10.4