diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-31 07:39:54 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-31 07:39:54 +0000 |
| commit | 57b23f591f859ebaac6e24877140d05bf8b229d1 (patch) | |
| tree | 31b8ae01df5ab263323739588e72cfffb0c07aec /devel/ode | |
| parent | dbd3fce72447fcf1ad9debaca91e011a207045f7 (diff) | |
- enable an "OPCODE" library that is required to support triangle mesh objects.
- changes the header include order so as not to pick up installed includes
before local ones
- suppresses the unneeded use of values.h
- works around an inlining limitation in g++
PR: ports/81610
Submitted by: Jonathan Hanna <jhanna@shaw.ca>
Approved by: David Yeske <dyeske@yahoo.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=136492
Diffstat (limited to 'devel/ode')
| -rw-r--r-- | devel/ode/Makefile | 12 | ||||
| -rw-r--r-- | devel/ode/files/patch-Makefile | 4 | ||||
| -rw-r--r-- | devel/ode/files/patch-OPC_TreeCollider.h | 30 |
3 files changed, 44 insertions, 2 deletions
diff --git a/devel/ode/Makefile b/devel/ode/Makefile index 70cb8f5238dd..68d54a7e3e62 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -7,6 +7,7 @@ PORTNAME= ode PORTVERSION= 0.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -21,6 +22,8 @@ USE_GL= yes USE_GMAKE= yes USE_REINPLACE= yes +OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on + .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" @@ -42,6 +45,15 @@ post-patch: s|-fno-rtti||; \ s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \ ${WRKSRC}/config/makefile.unix-gcc +.if !defined(WITHOUT_OPCODE) + @${REINPLACE_CMD} -e \ + 's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \ + ${WRKSRC}/config/user-settings +.endif + +do-configure: + cd ${WRKSRC} ; ${GMAKE} configure + @${REINPLACE_CMD} -e '/include.*values.h/d' ${WRKSRC}/include/ode/config.h do-install: @${INSTALL_DATA} ${WRKSRC}/lib/libode.a ${PREFIX}/lib diff --git a/devel/ode/files/patch-Makefile b/devel/ode/files/patch-Makefile index f5b40782f98d..0507e3210d1b 100644 --- a/devel/ode/files/patch-Makefile +++ b/devel/ode/files/patch-Makefile @@ -5,11 +5,11 @@ %$(OBJ): %.c - $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $< -+ $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OUT)$@ $< ++ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(DEFINES) $(C_OUT)$@ $< %$(OBJ): %.cpp - $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $< -+ $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $< ++ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $< %.exe: %$(OBJ) - $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) diff --git a/devel/ode/files/patch-OPC_TreeCollider.h b/devel/ode/files/patch-OPC_TreeCollider.h new file mode 100644 index 000000000000..297a0aeaa80f --- /dev/null +++ b/devel/ode/files/patch-OPC_TreeCollider.h @@ -0,0 +1,30 @@ +--- OPCODE/OPC_TreeCollider.h.orig Mon May 23 20:11:48 2005 ++++ OPCODE/OPC_TreeCollider.h Mon May 23 20:16:16 2005 +@@ -28,6 +28,13 @@ + //! even entering the recursive collision code. + struct OPCODE_API BVTCache : Pair + { ++ inline_ void ResetCountDown() ++ { ++#ifdef __MESHMERIZER_H__ // Collision hulls only supported within ICE ! ++ CountDown = 50; ++#endif // __MESHMERIZER_H__ ++ } ++ + //! Constructor + inline_ BVTCache() + { +@@ -46,13 +53,6 @@ + SepVector.pid = 0; + SepVector.qid = 0; + SepVector.SV = Point(1.0f, 0.0f, 0.0f); +-#endif // __MESHMERIZER_H__ +- } +- +- inline_ void ResetCountDown() +- { +-#ifdef __MESHMERIZER_H__ // Collision hulls only supported within ICE ! +- CountDown = 50; + #endif // __MESHMERIZER_H__ + } + |