Since we require OSG 3.0 now, this check is obsolete.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f583d0a01bba52f2460f61ab7dc6630ea781e026..3549c89eaf45dcce7e6d29a13afb738a1978561b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,19 +254,6 @@ check_include_file(unistd.h   HAVE_UNISTD_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(windows.h  HAVE_WINDOWS_H)
 
-# definition depends on OSG version
-set(CMAKE_REQUIRED_INCLUDES ${OPENSCENEGRAPH_INCLUDE_DIRS})
-
-check_cxx_source_compiles(
-    "#include <osg/CullSettings>
-    int main()
-    {
-        osg::CullSettings::VariablesMask mask = osg::CullSettings::CLEAR_MASK;
-        return 0;
-    }
-    "
-    HAVE_CULLSETTINGS_CLEAR_MASK)
-
 if(ENABLE_RTI)
     find_package(RTI)
     if(RTI_FOUND)

diff --git a/src/Include/config.h-msvc90 b/src/Include/config.h-msvc90
index 8381fe5bf5b0a3d16633d311e839da69b1db021c..d83c47114cf99eb6e7a454a25ed3fc91ab1168f9 100644 (file)
--- a/src/Include/config.h-msvc90
+++ b/src/Include/config.h-msvc90
@@ -164,8 +164,6 @@
 
 #define NOMINMAX 1
 
-#define HAVE_CULLSETTINGS_CLEAR_MASK 1
-
 #ifndef ENABLE_AUDIO_SUPPORT
 #define  ENABLE_AUDIO_SUPPORT
 #endif

diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in
index 23af01f2f6284b6fc13c4bd8d56dc249718691d3..245854c827e01e63dcb4e3c0cda8eb22ea2cada7 100644 (file)
--- a/src/Include/config_cmake.h.in
+++ b/src/Include/config_cmake.h.in
@@ -18,7 +18,6 @@
 
 #cmakedefine HAVE_SYS_TIME_H
 #cmakedefine HAVE_WINDOWS_H
-#cmakedefine HAVE_CULLSETTINGS_CLEAR_MASK
 #cmakedefine HAVE_MKFIFO
 
 #define VERSION "@FLIGHTGEAR_VERSION@"

diff --git a/src/Viewer/CameraGroup.cxx b/src/Viewer/CameraGroup.cxx
index 71b11d0656eac85bf87cdb8b45b08e5e52f74149..9322fd0408a9acc81e7bf864b5620e4a88f8d473 100644 (file)
--- a/src/Viewer/CameraGroup.cxx
+++ b/src/Viewer/CameraGroup.cxx
@@ -750,9 +750,7 @@ CameraInfo* CameraGroup::buildCamera(SGPropertyNode* cameraNode)
     camera->setInheritanceMask(CullSettings::ALL_VARIABLES
                                & ~(CullSettings::CULL_MASK
                                    | CullSettings::CULLING_MODE
-#if defined(HAVE_CULLSETTINGS_CLEAR_MASK)
                                    | CullSettings::CLEAR_MASK
-#endif
                                    ));
 
     osg::Matrix vOff;
@@ -999,9 +997,7 @@ CameraInfo* CameraGroup::buildGUICamera(SGPropertyNode* cameraNode,
     camera->setInheritanceMask(CullSettings::ALL_VARIABLES
                                & ~(CullSettings::COMPUTE_NEAR_FAR_MODE
                                    | CullSettings::CULLING_MODE
-#if defined(HAVE_CULLSETTINGS_CLEAR_MASK)
                                    | CullSettings::CLEAR_MASK
-#endif
                                    ));
     camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
     camera->setCullingMode(osg::CullSettings::NO_CULLING);