From Matthew May, fixes for threading problems under FreeBSD build.
This commit is contained in:
@@ -53,7 +53,7 @@ MAKEDEPEND = ignore
|
||||
VERSION_MAJOR = 1
|
||||
VERSION_MINOR = 0
|
||||
VERSION_RELEASE = 0
|
||||
VERSION_REVISION ?= 1
|
||||
VERSION_REVISION ?= 0
|
||||
ifneq (,$(OSG_VERSION_REVISION))
|
||||
VERSION_REVISION = $(OSG_VERSION_REVISION)
|
||||
endif
|
||||
@@ -422,16 +422,16 @@ endif
|
||||
ifeq ($(OS),FreeBSD)
|
||||
C++ = g++
|
||||
DEPARG = -MM
|
||||
INC += -I/usr/local/include -I/usr/X11R6/include
|
||||
DEF += -W -Wall
|
||||
INC += -I/usr/local/include -I/usr/X11R6/include
|
||||
DEF += -W -Wall -pthread
|
||||
OPTF = -O2
|
||||
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
|
||||
SHARED = -shared
|
||||
ARCH =
|
||||
ARCHINST =
|
||||
ARCHARGS =
|
||||
LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread
|
||||
DYNAMICLIBRARYLIB =
|
||||
LINKARGS = -pthread -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
|
||||
DYNAMICLIBRARYLIB =
|
||||
OSG_LIBS = -losgGA -losgDB -losgUtil -losg
|
||||
GL_LIBS = -lGLU -lGL
|
||||
GLUT_LIBS = -lglut
|
||||
|
||||
Reference in New Issue
Block a user