diff --git a/.gitattributes b/.gitattributes index 044d626..5f55e1f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -65,7 +65,6 @@ freeglut/freeglut/src/android/fg_window_android.c -text freeglut/freeglut/src/android/native_app_glue/README -text freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.c -text freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.h -text -freeglut/freeglut/src/android/opengles_stubs.c -text freeglut/freeglut/src/egl/fg_display_egl.c -text freeglut/freeglut/src/egl/fg_init_egl.c -text freeglut/freeglut/src/egl/fg_internal_egl.h -text @@ -98,6 +97,7 @@ freeglut/freeglut/src/fg_teapot_data.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_videoresize.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_window.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/freeglutdll.def.in svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/src/gles_stubs.c -text freeglut/freeglut/src/mswin/fg_cursor_mswin.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/mswin/fg_display_mswin.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/mswin/fg_ext_mswin.c svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt index 05ee255..a23bd02 100644 --- a/freeglut/freeglut/CMakeLists.txt +++ b/freeglut/freeglut/CMakeLists.txt @@ -66,6 +66,10 @@ IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1) src/fg_menu.c src/fg_teapot.c ) +ELSE() + LIST(APPEND FREEGLUT_SRCS + src/gles_stubs.c + ) ENDIF() IF(WIN32) @@ -112,7 +116,6 @@ ELSEIF(ANDROID) src/android/fg_spaceball_android.c src/android/fg_state_android.c src/android/fg_window_android.c - src/android/opengles_stubs.c src/android/fg_internal_android.h ) ELSE() diff --git a/freeglut/freeglut/src/android/opengles_stubs.c b/freeglut/freeglut/src/gles_stubs.c similarity index 100% rename from freeglut/freeglut/src/android/opengles_stubs.c rename to freeglut/freeglut/src/gles_stubs.c