Commit [r1687] Maximize Restore History

Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)

beuc 2014-06-01

removed /trunk/freeglut/freeglut/android/gles1
changed /trunk/freeglut/freeglut/src/fg_gl2.c
changed /trunk/freeglut/freeglut/src/egl/fg_window_egl.c
changed /trunk/freeglut/freeglut/CMakeLists.txt
changed /trunk/freeglut/freeglut/src/fg_geometry.c
changed /trunk/freeglut/freeglut/progs/test-shapes-gles1/CMakeLists.txt
changed /trunk/freeglut/freeglut/include/GL/freeglut_std.h
copied /trunk/freeglut/freeglut/android/gles2/Android.mk -> /trunk/freeglut/freeglut/android/Android.mk
/trunk/freeglut/freeglut/src/fg_gl2.c Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/src/egl/fg_window_egl.c Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/CMakeLists.txt Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/src/fg_geometry.c Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/progs/test-shapes-gles1/CMakeLists.txt Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/include/GL/freeglut_std.h Diff Switch to side-by-side view
Loading...
/trunk/freeglut/freeglut/android/gles2/Android.mk to /trunk/freeglut/freeglut/android/Android.mk
--- a/trunk/freeglut/freeglut/android/gles2/Android.mk
+++ b/trunk/freeglut/freeglut/android/Android.mk
@@ -2,8 +2,8 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := freeglut-gles2
-LOCAL_SRC_FILES := lib/libfreeglut-gles2.a
+LOCAL_MODULE := freeglut-gles
+LOCAL_SRC_FILES := lib/libfreeglut-gles.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 
 include $(PREBUILT_STATIC_LIBRARY)