From 460a78b454d57b27044e3953bc1dbc4064ebe9b4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 29 Dec 2001 12:28:24 +0000 Subject: [PATCH] Updates form Randall Hopper for the FreeBSD build --- src/Demos/Makefile | 3 +++ src/Demos/osgcluster/broadcaster.cpp | 10 +++++++--- src/Demos/osgcluster/receiver.cpp | 3 ++- src/Makefile | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Demos/Makefile b/src/Demos/Makefile index f78609693..6fca9987b 100644 --- a/src/Demos/Makefile +++ b/src/Demos/Makefile @@ -6,6 +6,9 @@ DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide # comment out if you don't have the freetype and GLU1.3 library installed. DIRS += osgtext +# comment out if you don't have the wxWindows installed. +# DIRS += wxsgv + all : for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done diff --git a/src/Demos/osgcluster/broadcaster.cpp b/src/Demos/osgcluster/broadcaster.cpp index 5a6819d94..4015ddcb4 100644 --- a/src/Demos/osgcluster/broadcaster.cpp +++ b/src/Demos/osgcluster/broadcaster.cpp @@ -13,10 +13,14 @@ #include #include -#ifdef __linux -#include +#if defined(__linux) +# include +#elif defined(__FreeBSD__) +# include +#elif defined(__sgi) +# include #else -#include +# error Teach me how to build on this system #endif #include "broadcaster.h" diff --git a/src/Demos/osgcluster/receiver.cpp b/src/Demos/osgcluster/receiver.cpp index f24b9162c..d513d348d 100644 --- a/src/Demos/osgcluster/receiver.cpp +++ b/src/Demos/osgcluster/receiver.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include "receiver.h" @@ -77,7 +78,7 @@ void Receiver::sync( void ) return; } -#ifdef __linux +#if defined(__linux) || defined(__FreeBSD__) socklen_t #else int diff --git a/src/Makefile b/src/Makefile index e89e1ec0a..f2a403de6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,6 +6,9 @@ DIRS = osg osgDB osgUtil osgGLUT # comment out if you don't have the freetype and GLU1.3 library installed. DIRS += osgText +# comment out if you don't have the wxWindows installed. +# DIRS += osgWX + DIRS += Demos DIRS += osgPlugins