FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to support building against ANDROID under OSX.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14399 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-08-08 09:28:26 +00:00
parent fdd9efe45a
commit 99cbab1806
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -540,7 +540,7 @@ IF (OSG_GL3_AVAILABLE)
ENDIF() ENDIF()
ELSEIF(OSG_GLES1_AVAILABLE) ELSEIF(OSG_GLES1_AVAILABLE)
IF (APPLE) IF (APPLE AND NOT ANDROID)
SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header") SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header")
SET(OPENGL_HEADER2 "#include <OpenGLES/ES1/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required") SET(OPENGL_HEADER2 "#include <OpenGLES/ES1/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required")
ELSE() ELSE()
@ -548,7 +548,7 @@ ELSEIF(OSG_GLES1_AVAILABLE)
SET(OPENGL_HEADER2 "" CACHE STRING "#include<> line for additional OpenGL Headers if required") SET(OPENGL_HEADER2 "" CACHE STRING "#include<> line for additional OpenGL Headers if required")
ENDIF() ENDIF()
ELSEIF(OSG_GLES2_AVAILABLE) ELSEIF(OSG_GLES2_AVAILABLE)
IF (APPLE) IF (APPLE AND NOT ANDROID)
SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header") SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header")
SET(OPENGL_HEADER2 "#include <OpenGLES/ES2/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required") SET(OPENGL_HEADER2 "#include <OpenGLES/ES2/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required")
ELSE() ELSE()

5
include/osg/Texture
View File

@ -305,6 +305,11 @@
#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E #define GL_RGBA_INTEGER_MODE_EXT 0x8D9E
#endif #endif
#ifndef GL_VERSION_1_1
#define GL_R3_G3_B2 0x2A10
#define GL_RGB4 0x804F
#endif
#ifndef GL_ARB_texture_rg #ifndef GL_ARB_texture_rg
#define GL_RG 0x8227 #define GL_RG 0x8227
#define GL_RG_INTEGER 0x8228 #define GL_RG_INTEGER 0x8228