FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move OpenGL ES stubs out of Android

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1175 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-03-17 10:33:28 +00:00
parent 5149d43941
commit 04e3e33ad7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -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/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.c -text
freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.h -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_display_egl.c -text
freeglut/freeglut/src/egl/fg_init_egl.c -text freeglut/freeglut/src/egl/fg_init_egl.c -text
freeglut/freeglut/src/egl/fg_internal_egl.h -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_videoresize.c svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/fg_window.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/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_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_display_mswin.c svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/mswin/fg_ext_mswin.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/mswin/fg_ext_mswin.c svn_keywords=Author+Date+Id+Revision

5
freeglut/freeglut/CMakeLists.txt
View File

@ -66,6 +66,10 @@ IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1)
src/fg_menu.c src/fg_menu.c
src/fg_teapot.c src/fg_teapot.c
) )
ELSE()
LIST(APPEND FREEGLUT_SRCS
src/gles_stubs.c
)
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
@ -112,7 +116,6 @@ ELSEIF(ANDROID)
src/android/fg_spaceball_android.c src/android/fg_spaceball_android.c
src/android/fg_state_android.c src/android/fg_state_android.c
src/android/fg_window_android.c src/android/fg_window_android.c
src/android/opengles_stubs.c
src/android/fg_internal_android.h src/android/fg_internal_android.h
) )
ELSE() ELSE()

0
freeglut/freeglut/src/android/opengles_stubs.c → freeglut/freeglut/src/gles_stubs.c
View File