diff options
Diffstat (limited to 'graphics/osg-devel/files/patch-Make::makedefs')
| -rw-r--r-- | graphics/osg-devel/files/patch-Make::makedefs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/graphics/osg-devel/files/patch-Make::makedefs b/graphics/osg-devel/files/patch-Make::makedefs index 929f197e3ff4..8ecc8343ea4f 100644 --- a/graphics/osg-devel/files/patch-Make::makedefs +++ b/graphics/osg-devel/files/patch-Make::makedefs @@ -1,15 +1,6 @@ ---- Make/makedefs.orig Tue Apr 15 04:39:12 2003 -+++ Make/makedefs Sat Jul 26 10:15:38 2003 -@@ -70,7 +70,7 @@ - ## doesn't make a distinction, we will. - ############################################################################ - --CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) -+CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) %%CXXFLAGS%% - LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) - OBJS = $(C++FILES:.cpp=.o) \ - $(CXXFILES:.cpp=.o) \ -@@ -303,26 +303,33 @@ +--- Make/makedefs.orig Thu Oct 2 22:43:39 2003 ++++ Make/makedefs Sat Oct 18 01:04:39 2003 +@@ -359,17 +359,17 @@ #### FreeBSD specific definitions ifeq ($(OS),FreeBSD) @@ -20,7 +11,7 @@ + INC += -I${LOCALBASE}/include -I${X11BASE}/include DEF += -W -Wall - OPTF = -O2 -+ OPTF = ++ OPTF = %%CXXFLAGS%% DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared ARCH = @@ -31,13 +22,14 @@ DYNAMICLIBRARYLIB = OSG_LIBS = -losgGA -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype - GL_LIBS = -lGLU -lGL +@@ -377,9 +377,17 @@ + X_INC = -I/usr/X11R6/include X_LIBS = -lXmu -lX11 SOCKET_LIBS = -- OTHER_LIBS = +- OTHER_LIBS = -lOpenThreads - INST_LOCATION = /opt/X11R6 - INST_SHARE = /usr/share/OpenSceneGraph -+ OTHER_LIBS = ${PTHREAD_LIBS} ++ OTHER_LIBS = -lOpenThreads ${PTHREAD_LIBS} + INST_LOCATION = ${PREFIX} + INST_SHARE = ${PREFIX}/share + INST_EXAMPLES = ${INST_SHARE}/examples/osg/bin @@ -47,6 +39,7 @@ + INST_DATA = ${INST_SHARE}/osg + INSTBINCMD = ${BSD_INSTALL_PROGRAM} + INSTDEVCMD = ${BSD_INSTALL_DATA} ++ LIBXML2_INCLUDE = -I${LOCALBASE}/include/libxml2 endif #### MacOS X specific definitions |