X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=9ca349d3e3e87e3a3e60c8bf4a9590da790bb59d;hb=fb29571c01756cdf842d506fa80b794260501202;hp=397caff37f031aca2bfe7f41b4b6a37ffdf01576;hpb=d9ac7ad35711510700cbe6d9df98af8a2a355ad0;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 397caff..9ca349d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,7 @@ IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1)
         src/fg_geometry.c
         src/fg_menu.c
         src/fg_teapot.c
+        src/fg_teapot_data.h
     )
 ELSE()
     LIST(APPEND FREEGLUT_SRCS
@@ -102,6 +103,7 @@ ELSEIF(ANDROID)
         src/egl/fg_internal_egl.h
         src/egl/fg_display_egl.c
         src/egl/fg_init_egl.c
+        src/egl/fg_state_egl.c
         src/egl/fg_structure_egl.c
         src/egl/fg_structure_egl.h
         src/egl/fg_window_egl.c
@@ -152,7 +154,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})
@@ -361,11 +363,21 @@ ENDIF()
 # pkg-config support, to install at $(libdir)/pkgconfig
 # Define static build dependencies
 IF(WIN32)
-  SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32")
-ELSEIF(ANDROID)
-  SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL")
+  SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32 -lm")
+ELSEIF(FREEGLUT_GLES2)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL -lm")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL -lm")
+  ENDIF()
+ELSEIF(FREEGLUT_GLES1)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL -lm")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL -lm")
+  ENDIF()
 ELSE()
-  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL")
+  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm")
 ENDIF()
 # Client applications need to define FreeGLUT GLES version to
 # bootstrap headers inclusion in freeglut_std.h: