diff -Nbaur OpenSceneGraph-2.8.3/CMakeLists.txt OpenSceneGraph-2.8.3-haiku/CMakeLists.txt
|
old
|
new
|
|
| 152 | 152 | # Also, remember OS X X11 is a user installed option so it may not exist. |
| 153 | 153 | FIND_PACKAGE(X11) |
| 154 | 154 | # Some Unicies need explicit linkage to the Math library or the build fails. |
| 155 | | FIND_LIBRARY(MATH_LIBRARY m) |
| | 155 | FIND_LIBRARY(MATH_LIBRARY root) |
| 156 | 156 | ENDIF(UNIX) |
| 157 | 157 | |
| 158 | 158 | # Make the headers visible to everything |
| … |
… |
|
| 163 | 163 | INCLUDE_DIRECTORIES( |
| 164 | 164 | ${OpenSceneGraph_SOURCE_DIR}/include |
| 165 | 165 | ${OPENGL_INCLUDE_DIR} |
| | 166 | /boot/develop/headers/os/opengl/GL |
| 166 | 167 | ) |
| 167 | 168 | |
| 168 | 169 | # Common global definitions |
diff -Nbaur OpenSceneGraph-2.8.3/include/osgDB/ConvertUTF OpenSceneGraph-2.8.3-haiku/include/osgDB/ConvertUTF
|
old
|
new
|
|
| 19 | 19 | |
| 20 | 20 | #include <string> |
| 21 | 21 | |
| 22 | | #ifdef __CYGWIN__ |
| | 22 | #if defined(__CYGWIN__) || defined(__HAIKU__) |
| 23 | 23 | namespace std |
| 24 | 24 | { |
| 25 | 25 | typedef basic_string<wchar_t> wstring; |
diff -Nbaur OpenSceneGraph-2.8.3/src/osgDB/FileUtils.cpp OpenSceneGraph-2.8.3-haiku/src/osgDB/FileUtils.cpp
|
old
|
new
|
|
| 57 | 57 | #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) |
| 58 | 58 | #define stat64 stat |
| 59 | 59 | #endif |
| 60 | | #elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) |
| | 60 | #elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__HAIKU__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) |
| 61 | 61 | #define stat64 stat |
| 62 | 62 | #endif |
| 63 | 63 | |
diff -Nbaur OpenSceneGraph-2.8.3/src/osgViewer/GraphicsWindowX11.cpp OpenSceneGraph-2.8.3-haiku/src/osgViewer/GraphicsWindowX11.cpp
|
old
|
new
|
|
| 16 | 16 | * These elements are licensed under OSGPL as above, with Copyright (C) 2001-2004 Don Burns. |
| 17 | 17 | */ |
| 18 | 18 | |
| | 19 | #if !defined(__HAIKU__) |
| | 20 | |
| 19 | 21 | #include <osgViewer/api/X11/GraphicsWindowX11> |
| 20 | 22 | #include <osgViewer/api/X11/PixelBufferX11> |
| 21 | 23 | |
| … |
… |
|
| 1895 | 1897 | XFlush(display); |
| 1896 | 1898 | XSync(display,0); |
| 1897 | 1899 | } |
| | 1900 | |
| | 1901 | #endif |
diff -Nbaur OpenSceneGraph-2.8.3/src/osgViewer/PixelBufferX11.cpp OpenSceneGraph-2.8.3-haiku/src/osgViewer/PixelBufferX11.cpp
|
old
|
new
|
|
| 16 | 16 | * These elements are license under OSGPL as above, with Copyright (C) 2001-2004 Don Burns. |
| 17 | 17 | */ |
| 18 | 18 | |
| | 19 | #if !defined(__HAIKU__) |
| | 20 | |
| 19 | 21 | #include <osgViewer/api/X11/PixelBufferX11> |
| 20 | 22 | #include <osgViewer/api/X11/GraphicsWindowX11> |
| 21 | 23 | #include <osg/GLExtensions> |
| … |
… |
|
| 448 | 450 | |
| 449 | 451 | glXSwapBuffers(_display, _pbuffer); |
| 450 | 452 | } |
| | 453 | |
| | 454 | #endif |