From 01e781f2e9efc4ad0c3ca5957da5e0a21d91ccd2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Oct 2009 12:06:00 +0000 Subject: [PATCH] Introduced Cmake generated #defines relevant to optionally compile parts of the OSG for different OpenGL targets --- CMakeLists.txt | 23 ++++++++++++++++++++++- src/osg/Config.in | 10 ++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31bbf2b3b..c349ffbaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -281,7 +281,28 @@ MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS) OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON) OPTION(OSG_GLU_AVAILABLE "Set to OFF to disable use of OpenGL GLU library." ${OPENGL_GLU_FOUND}) -MARK_AS_ADVANCED(OSG_GLU_AVAILABLE) +# MARK_AS_ADVANCED(OSG_GLU_AVAILABLE) + + +OPTION(OSG_GL1_AVAILABLE "Set to OFF to disable use of OpenGL 1.x functions library." ON) +# MARK_AS_ADVANCED(OSG_GL1_AVAILABLE) + +OPTION(OSG_GL2_AVAILABLE "Set to OFF to disable use of OpenGL 2.x functions library." ON) +# MARK_AS_ADVANCED(OSG_GL2_AVAILABLE) + +OPTION(OSG_GL3_AVAILABLE "Set to OFF to disable use of OpenGL 3.x functions library." OFF) +# MARK_AS_ADVANCED(OSG_GL3_AVAILABLE) + +OPTION(OSG_GLES1_AVAILABLE "Set to OFF to disable use of OpenGL ES 1.x functions library." OFF) +# MARK_AS_ADVANCED(OSG_GLES1_AVAILABLE) + +OPTION(OSG_GLES2_AVAILABLE "Set to OFF to disable use of OpenGL ES 2.x functions library." OFF) +# MARK_AS_ADVANCED(OSG_GLES2_AVAILABLE) + +SET(OSG_GL_DISPLAYLISTS_AVAILABLE ${OSG_GL1_AVAILABLE}) +SET(OSG_GL_MATRICES_AVAILABLE ${OSG_GL1_AVAILABLE}) +SET(OSG_GL_VERTEX_FUNCS_AVAILABLE ${OSG_GL1_AVAILABLE}) +SET(OSG_GL_FIXED_FUNCTION_AVAILABLE ${OSG_GL1_AVAILABLE}) ################################################################################ # Set Config file diff --git a/src/osg/Config.in b/src/osg/Config.in index 905e641bb..53f2f6748 100644 --- a/src/osg/Config.in +++ b/src/osg/Config.in @@ -30,6 +30,16 @@ #cmakedefine OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION #cmakedefine OSG_USE_UTF8_FILENAME #cmakedefine OSG_DISABLE_MSVC_WARNINGS + #cmakedefine OSG_GLU_AVAILABLE +#cmakedefine OSG_GL1_AVAILABLE +#cmakedefine OSG_GL2_AVAILABLE +#cmakedefine OSG_GL3_AVAILABLE +#cmakedefine OSG_GLES1_AVAILABLE +#cmakedefine OSG_GLES2_AVAILABLE +#cmakedefine OSG_GL_DISPLAYLISTS_AVAILABLE +#cmakedefine OSG_GL_MATRICES_AVAILABLE +#cmakedefine OSG_GL_VERTEX_FUNCS_AVAILABLE +#cmakedefine OSG_GL_FIXED_FUNCTION_AVAILABLE #endif