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

Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config

Browse Source
This commit is contained in:
Robert Osfield 2017-05-24 19:40:08 +01:00
parent 8c54a49319
commit 20ac472d1f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -442,6 +442,8 @@ ENDIF(WIN32 AND NOT ANDROID)
OPTION(OSG_NOTIFY_DISABLED "Set to ON to build OpenSceneGraph with the notify() disabled." OFF) OPTION(OSG_NOTIFY_DISABLED "Set to ON to build OpenSceneGraph with the notify() disabled." OFF)
OPTION(OSG_USE_DEPRECATED_API "Set to ON to build OpenSceneGraph with the OSG_USE_DEPREFATED_API #define enabled to allow access to deprecated APIs ." ON)
OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF) OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX) MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)

4
include/osg/Export
View File

@ -15,10 +15,6 @@
#define OSG_EXPORT_ 1 #define OSG_EXPORT_ 1
#include<osg/Config> #include<osg/Config>
// define USE_DEPRECATED_API is used to include in API which is being fazed out
// if you can compile your apps with this turned off you are
// well placed for compatibility with future versions.
#define USE_DEPRECATED_API
// disable VisualStudio warnings // disable VisualStudio warnings
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)

1
src/osg/Config.in
View File

@ -33,5 +33,6 @@
#cmakedefine OSG_USE_UTF8_FILENAME #cmakedefine OSG_USE_UTF8_FILENAME
#cmakedefine OSG_DISABLE_MSVC_WARNINGS #cmakedefine OSG_DISABLE_MSVC_WARNINGS
#cmakedefine OSG_PROVIDE_READFILE #cmakedefine OSG_PROVIDE_READFILE
#cmakedefine OSG_USE_DEPRECATED_API
#endif #endif