From 99cbab18060e41505bd0ccd4ee41ebf19fe12a45 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Aug 2014 09:28:26 +0000 Subject: [PATCH] Changes to support building against ANDROID under OSX. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14399 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeLists.txt | 4 ++-- include/osg/Texture | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d297800ed..218063c24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -540,7 +540,7 @@ IF (OSG_GL3_AVAILABLE) ENDIF() 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_HEADER2 "#include " CACHE STRING "#include<> line for additional OpenGL Headers if required") ELSE() @@ -548,7 +548,7 @@ ELSEIF(OSG_GLES1_AVAILABLE) SET(OPENGL_HEADER2 "" CACHE STRING "#include<> line for additional OpenGL Headers if required") ENDIF() 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_HEADER2 "#include " CACHE STRING "#include<> line for additional OpenGL Headers if required") ELSE() diff --git a/include/osg/Texture b/include/osg/Texture index 42ba43c1d..6c304dca9 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -305,6 +305,11 @@ #define GL_RGBA_INTEGER_MODE_EXT 0x8D9E #endif +#ifndef GL_VERSION_1_1 +#define GL_R3_G3_B2 0x2A10 +#define GL_RGB4 0x804F +#endif + #ifndef GL_ARB_texture_rg #define GL_RG 0x8227 #define GL_RG_INTEGER 0x8228