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

From FrancoisTigeot, "OpenSceneGraph 3.0.1 doesn't build out of the box on DragonFly and needs

Browse Source 
a few modifications to these files:
  - applications/present3D/Cluster.cpp
  - src/osgDB/FileUtils.cpp

The changes are needed to fix a few platform specific things such as the
absence of stat64, int/socklen_t differences, etc... and are in the same
line as Linux, Apple and FreeBSD specific checks.

I have attached the modified files; the original patches to 3.0.1 are
also visible here if you find it more convenient:
http://dl.wolfpond.org/dports/graphics.osg/dragonfly/patch-applications_present3D_Cluster.cpp
http://dl.wolfpond.org/dports/graphics.osg/dragonfly/patch-src_osgDB_FileUtils.cpp

With these changes, osg 3.0.1 is able to be built and packaged on DragonFly
whereas it previously failed to compile."
This commit is contained in:
Robert Osfield 2013-06-21 09:17:28 +00:00
parent c3f28a52e4
commit d0f4086a57
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/present3D/Cluster.cpp
View File

@ -33,7 +33,7 @@
#if defined(__linux) #if defined(__linux)
#include <unistd.h> #include <unistd.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <unistd.h> #include <unistd.h>
#include <sys/sockio.h> #include <sys/sockio.h>
#elif defined(__sgi) #elif defined(__sgi)
@ -336,7 +336,8 @@ void Receiver::sync( void )
return; return;
} }
#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
defined(__DragonFly__)
socklen_t socklen_t
#else #else
int int

3
src/osgDB/FileUtils.cpp
View File

@ -76,7 +76,8 @@ typedef char TCHAR;
#if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
#define stat64 stat #define stat64 stat
#endif #endif
#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) #elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
(defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
#define stat64 stat #define stat64 stat
#endif #endif