Changeset 13436

Show
Ignore:
Timestamp:
11/21/14 21:16:16 (42 hours ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osg/Camera

    r13041 r13436  
    2525 
    2626#include <OpenThreads/Mutex> 
     27 
     28 
     29#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) 
     30    #define GL_FRONT_LEFT       0x0400 
     31    #define GL_FRONT_RIGHT      0x0401 
     32    #define GL_BACK_LEFT        0x0402 
     33    #define GL_BACK_RIGHT       0x0403 
     34#endif 
    2735 
    2836namespace osg { 
  • OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

    r13373 r13436  
    3232using namespace osg; 
    3333using namespace osgUtil; 
    34  
    35 #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) 
    36     // define under GLES to keep the main SceneView.cpp clean. 
    37     #define GL_BACK_LEFT        0x0402 
    38     #define GL_BACK_RIGHT       0x0403 
    39 #endif 
    4034 
    4135static const GLubyte patternVertEven[] = {