diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-11-07 20:47:15 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-11-07 20:47:15 +0300 |
commit | e46a6d261133f973c55756f35978c50effe621d2 (patch) | |
tree | 1bcc88f1e1371f2b5515c6e7e1ec9c4fc4d4c14e /source | |
parent | 2c183d2da728d941418e253d900d826b1592b0ce (diff) |
I autmated the rest of building libfrozen.a
I also moved it so that it gets put in:
$(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a
and removed the stuff from the readme on how to do it by hand.
(I made one other small change and that was to comment
out the ssr target on solaris and freebsd in source/Makefile
I forgot to commit it yesterday)
Kent
--
mein@cs.umn.edu
Diffstat (limited to 'source')
-rw-r--r-- | source/Makefile | 25 | ||||
-rw-r--r-- | source/blender/bpython/Makefile | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/source/Makefile b/source/Makefile index 215ca8bc972..d27c309a3c6 100644 --- a/source/Makefile +++ b/source/Makefile @@ -44,17 +44,18 @@ ifeq ($(OS),windows) DIRS += icons endif -ifeq ($(OS),solaris) - ifeq ($(CPU),sparc) - DIRS += ssr - endif -endif - -ifeq ($(OS),freebsd) - ifeq ($(OS_VERSION),4.5) - DIRS += ssr - endif -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 @@ -98,7 +99,7 @@ PYPLAYERLIB ?= $(PYLIB) GRCLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a GRCLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRCLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.a - GRCLIB += $(NAN_PYTHON)/frozen/libfrozen.a + GRCLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a diff --git a/source/blender/bpython/Makefile b/source/blender/bpython/Makefile index ef58948bd88..819957631ff 100644 --- a/source/blender/bpython/Makefile +++ b/source/blender/bpython/Makefile @@ -32,6 +32,6 @@ # Bounces make to subdirectories. SOURCEDIR = source/blender/bpython -DIRS = intern +DIRS = frozen intern include nan_subdirs.mk |