Fixes for FreeBSD

This commit is contained in:
Robert Osfield
2004-05-12 20:31:58 +00:00
parent 5eafee1b83
commit 90579a0e17
2 changed files with 7 additions and 5 deletions

View File

@@ -373,8 +373,8 @@ ifeq ($(OS),FreeBSD)
ARCH =
ARCHINST =
ARCHARGS =
LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
DYNAMICLIBRARYLIB =
LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread
DYNAMICLIBRARYLIB =
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
FREETYPE_LIB = -lfreetype
GL_LIBS = -lGLU -lGL
@@ -382,8 +382,10 @@ ifeq ($(OS),FreeBSD)
X_LIBS = -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS = -lOpenThreads
INST_LOCATION = /opt/X11R6
INST_SHARE = /usr/share/OpenSceneGraph
PNG_LIBS = -lpng
JPEG_LIBS = -ljpeg
TIFF_LIB = -ltiff
GIF_LIBS = -lungif
endif
#### MacOS X specific definitions

View File

@@ -7,7 +7,7 @@
#include <stdio.h>
// Where is malloc.h really needed?
#if !defined(__APPLE__) && !defined(macintosh)
#if !defined(__APPLE__) && !defined(macintosh) && !defined(__FreeBSD__)
#include <malloc.h>
#endif
#include <math.h>