diff options
Diffstat (limited to 'devel/ode-devel/files')
-rw-r--r-- | devel/ode-devel/files/patch-Makefile | 28 | ||||
-rw-r--r-- | devel/ode-devel/files/patch-OPC_TreeCollider.h | 30 |
2 files changed, 0 insertions, 58 deletions
diff --git a/devel/ode-devel/files/patch-Makefile b/devel/ode-devel/files/patch-Makefile deleted file mode 100644 index 0507e3210d1b..000000000000 --- a/devel/ode-devel/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig Wed Jun 9 16:12:12 2004 -+++ Makefile Wed Jun 9 16:13:39 2004 -@@ -329,13 +329,13 @@ - -$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o - - %$(OBJ): %.c -- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(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_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $< - - %.exe: %$(OBJ) -- $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) -+ $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS} - - - # windows specific rules -@@ -357,7 +357,7 @@ - - # unix-gcc specific dependency making - --DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES) -+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES) - depend: - $(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps - $(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps diff --git a/devel/ode-devel/files/patch-OPC_TreeCollider.h b/devel/ode-devel/files/patch-OPC_TreeCollider.h deleted file mode 100644 index 297a0aeaa80f..000000000000 --- a/devel/ode-devel/files/patch-OPC_TreeCollider.h +++ /dev/null @@ -1,30 +0,0 @@ ---- 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__ - } - |