Added GLU_TESS_CALLBACK_TRIPLEDOT path into include/osg/GLU and enabled this
for AIX as reading the old paths this was required. This looks like it is needed under Xcode build as well.
This commit is contained in:
parent
38542c3986
commit
73b5712a7a
@ -99,7 +99,9 @@ INCLUDE_DIRECTORIES(
|
|||||||
# Platform specific definitions
|
# Platform specific definitions
|
||||||
|
|
||||||
|
|
||||||
|
IF (CMAKE_SYSTEM MATCHES "AIX.*")
|
||||||
|
ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
|
||||||
|
ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
|
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
#include <GL/glu.h>
|
#include <GL/glu.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef void (APIENTRY *GLU_TESS_CALLBACK)();
|
#if defined(GLU_TESS_CALLBACK_TRIPLEDOT)
|
||||||
|
typedef void (APIENTRY *GLU_TESS_CALLBACK)(...);
|
||||||
|
#else
|
||||||
|
typedef void (APIENTRY *GLU_TESS_CALLBACK)();
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // __osgGLU_h
|
#endif // __osgGLU_h
|
||||||
|
Loading…
Reference in New Issue
Block a user