- use ODE in lib/ for FreeBSD

- use default python library path
- remove obsolete SSR comments
This commit is contained in:
Hans Lambermont 2003-01-04 20:20:54 +00:00
parent 8dcdf3bf0b
commit 080dd299d6
4 changed files with 29 additions and 16 deletions

20
extern/ode/dist/FreeBSD-patch vendored Normal file

@ -0,0 +1,20 @@
diff -u -w -r1.2 Makefile
--- Makefile 4 Nov 2002 21:55:48 -0000 1.2
+++ Makefile 4 Jan 2003 20:18:18 -0000
@@ -243,13 +243,13 @@
-$(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)
%$(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

@ -39,7 +39,7 @@ endif
include nan_definitions.mk
DIRS = creator blender kernel gameengine
ifneq ($(OS),darwin)
ifneq ($(OS),$(findstring $(OS), "darwin freebsd"))
DIRS += ode
endif
@ -47,19 +47,6 @@ ifeq ($(OS),windows)
DIRS += icons
endif
# Commented out by mein this is the moble phone stuff.
#ifeq ($(OS),solaris)
# ifeq ($(CPU),sparc)
# DIRS += ssr
# endif
#endif
#
#ifeq ($(OS),freebsd)
# ifeq ($(OS_VERSION),4.5)
# DIRS += ssr
# endif
#endif
########## buildinfo kludge ###################
CPPFLAGS += -I../Physics/common
CPPFLAGS += -I../Physics/Dummy
@ -316,7 +303,7 @@ ifeq ($(OS),freebsd)
BINTARGETS += blenderssr
endif
endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB = /usr/local/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_MXTEXTTOOLS)
endif

@ -52,4 +52,4 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../../Physics/common
CPPFLAGS += -I../../Physics/Dummy
# nlin: fix this, should put in NAN_ODE dir
CPPFLAGS += -I./ode/ode/include
#CPPFLAGS += -I./ode/ode/include

@ -100,7 +100,13 @@ all debug::
export NAN_SOLID ?= $(SRCHOME)/sumo/SOLID-3.0
export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo
export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics
ifeq ($(OS),freebsd)
export NAN_ODE ?= $(LCGDIR)/ode
else
export NAN_ODE ?= $(SRCHOME)/ode
endif
ifeq ($(OS),freebsd)
export NAN_OPENSSL ?= /usr
else