diff options
| author | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-01-04 23:20:54 +0300 |
|---|---|---|
| committer | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-01-04 23:20:54 +0300 |
| commit | 080dd299d6122fd2231450c87c4ab921e34e1096 (patch) | |
| tree | beec9127e137eb2972b7d819c86f1caf91d92b27 /source | |
| parent | 8dcdf3bf0b9ce00dfb85550fff643f32026e8e05 (diff) | |
- use ODE in lib/ for FreeBSD
- use default python library path
- remove obsolete SSR comments
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 17 | ||||
| -rw-r--r-- | source/gameengine/Physics/BlOde/Makefile | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 6 |
3 files changed, 9 insertions, 16 deletions
diff --git a/source/Makefile b/source/Makefile index 37250a8fc9a..64ffcf26903 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/gameengine/Physics/BlOde/Makefile b/source/gameengine/Physics/BlOde/Makefile index 99e577be06b..fef57dfbcfa 100644 --- a/source/gameengine/Physics/BlOde/Makefile +++ b/source/gameengine/Physics/BlOde/Makefile @@ -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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 0f489be7a41..8c93cf07813 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 |