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

Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it.

Browse Source
This commit is contained in:
Robert Osfield
2003-08-18 10:58:30 +00:00
parent 8c65920c1f
commit 8d5aa5644d
92 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Make/makedefs
View File

@@ -193,6 +193,7 @@ ifeq ($(OS),SunOS)
DYNAMICLIBRARYLIB = -ldl
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lGLU -lGL
X_INC = -I/usr/X11R6/include
X_LIBS = -lXext -lXmu -lXi -lX11
SOCKET_LIBS = -lsocket -lnsl
INSTBINCMD = cp
@@ -239,6 +240,7 @@ ifeq ($(OS),IRIX)
DYNAMICLIBRARYLIB =
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lGLU -lGL
X_INC = -I/usr/X11R6/include
X_LIBS = -lXext -lXi -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS = -lm -lOpenThreads
@@ -305,6 +307,7 @@ ifeq ($(OS),Linux)
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
FREETYPE_LIB = -lfreetype
GL_LIBS = -lGLU -lGL
X_INC = -I/usr/X11R6/include
X_LIBS = -lXi -lXmu -lX11
PF_XTRA_LIBS = -L/usr/lib/libpfdb -Xlinker -rpath /usr/lib/libpfdb \
-lpfdu -lpfutil -lpf
@@ -334,6 +337,7 @@ ifeq ($(OS),FreeBSD)
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
FREETYPE_LIB = -lfreetype
GL_LIBS = -lGLU -lGL
X_INC = -I/usr/X11R6/include
X_LIBS = -lXmu -lX11
SOCKET_LIBS =
OTHER_LIBS = -lOpenThreads
@@ -360,6 +364,7 @@ ifeq ($(OS),Darwin)
FREETYPE_LIB = -lfreetype
CARBON_LIB = -framework Carbon
GL_LIBS = -framework OpenGL $(CARBON_LIB)
X_INC = -I/usr/X11R6/include
X_LIBS = -lX11
SOCKET_LIBS =
OTHER_LIBS = -lm -lstdc++ -lobjc -lOpenThreads
@@ -391,6 +396,7 @@ ifeq ($(OS),CYGWIN)
DYNAMICLIBRARYLIB =
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lglu32 -lopengl32
X_INC =
X_LIBS = -lgdi32 -luser32
SOCKET_LIBS =
OTHER_LIBS = -lOpenThreads
@@ -436,6 +442,7 @@ ifeq ($(OS),MINGW)
DYNAMICLIBRARYLIB =
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -lglu32 -lopengl32
X_INC =
X_LIBS = -lgdi32 -luser32
SOCKET_LIBS =
OTHER_LIBS = -lOpenThreads
@@ -492,6 +499,7 @@ endif
DYNAMICLIBRARYLIB = -ldld
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
GL_LIBS = -L/opt/graphics/OpenGL/lib -lGLU -lGL
X_INC = -I/usr/X11R6/include
X_LIBS = -L/usr/lib/X11R6 -lXext -lXi -lX11 -L/usr/lib/X11R4 -lXmu
SOCKET_LIBS =
# make sure that global constructors/destructors are called upon