From 73b5712a7ab734809eba82eb3dee8e9d0b72de52 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 3 Oct 2007 20:21:01 +0000 Subject: [PATCH] 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. --- CMakeLists.txt | 4 +++- include/osg/GLU | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c32cbc304..cdaa46b6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,9 @@ INCLUDE_DIRECTORIES( # Platform specific definitions - +IF (CMAKE_SYSTEM MATCHES "AIX.*") + ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT) +ENDIF(CMAKE_SYSTEM MATCHES "AIX.*") IF(WIN32) ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) diff --git a/include/osg/GLU b/include/osg/GLU index 745618aae..4cd9fd2a5 100644 --- a/include/osg/GLU +++ b/include/osg/GLU @@ -22,6 +22,10 @@ #include #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