[Bf-committers] 2.40 is out!

[Hans Lambermont]

Hans wrote:

...
> I'll have to commit some patches still but have to go now (try that
> later).

I just committed some minor include path and header file changes. The
other changes I made are less trivial and should probably not be
committed as is. Please comment on the changes below :

Index: extern/ode/dist/Makefile
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/ode/dist/Makefile,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile
--- extern/ode/dist/Makefile    4 Nov 2002 21:55:48 -0000       1.2
+++ extern/ode/dist/Makefile    27 Dec 2005 20:34:39 -0000
@@ -242,14 +242,16 @@
 clean:
        -$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)

+# Patched for FreeBSD
+
 %$(OBJ): %.c
-       $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
+       $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<

 %$(OBJ): %.cpp
-       $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
+       $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)$(OPT) $(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) -lXext

 # windows specific rules

Hans
-- 
http://hans.dse.nl/   () ASCII-ribbon campaign against vCards,
                      /\ HTML-mail and proprietary formats.