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 | |
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
-rwxr-xr-x | intern/python/freeze/freeze.py | 2 | ||||
-rw-r--r-- | intern/python/freeze/makemakefile.py | 5 | ||||
-rw-r--r-- | readme.txt | 4 | ||||
-rw-r--r-- | source/Makefile | 25 | ||||
-rw-r--r-- | source/blender/bpython/Makefile | 2 |
5 files changed, 21 insertions, 17 deletions
diff --git a/intern/python/freeze/freeze.py b/intern/python/freeze/freeze.py index e6f4ead15d5..fe6a586b7dc 100755 --- a/intern/python/freeze/freeze.py +++ b/intern/python/freeze/freeze.py @@ -124,7 +124,7 @@ def main(): frozen_c = 'frozen.c' config_c = 'config.c' target = 'a.out' # normally derived from script name - makefile = 'Makefile.freeze' + makefile = 'Makefile' subsystem = 'console' # parse command line by first replacing any "-i" options with the file contents. diff --git a/intern/python/freeze/makemakefile.py b/intern/python/freeze/makemakefile.py index bb2ed43430d..64a98992ae8 100644 --- a/intern/python/freeze/makemakefile.py +++ b/intern/python/freeze/makemakefile.py @@ -24,6 +24,8 @@ def makemakefile(outfp, makevars, files, target): keys.sort() for key in keys: outfp.write("%s=%s\n" % (key, makevars[key])) + + outfp.write("\n\ninclude nan_definitions.mk\n") outfp.write("\nall: %s\n\n" % libtarget) deps = [] @@ -48,7 +50,8 @@ def makemakefile(outfp, makevars, files, target): # libfiles.remove('M___main__.o') # don't link with __main__ outfp.write("\n%s: $(OBJS)\n" % (libtarget)) - outfp.write("\t$(AR) ruv %s $(OBJS)\n" % (targetlib)) + outfp.write("\t$(AR) ruv %s%s $(OBJS)\n" % + ("$(OCGDIR)/blender/bpython/$(DEBUG_DIR)", targetlib)) outfp.write("\n%s: %s $(OBJS)\n" % (target, mainfile)) outfp.write("\t$(CC) %s %s -o %s $(LDLAST)\n" % diff --git a/readme.txt b/readme.txt index 506df76aa7e..962c7a2adad 100644 --- a/readme.txt +++ b/readme.txt @@ -46,8 +46,8 @@ After that cd $NANBLENDERHOME/intern make make install -cd $NANBLENDERHOME/source/blender/bpython/frozen -make -f Makefile.freeze +cd $NANBLENDERHOME/source/ode +Look at the README_BLENDER and follow instructions Then cd $NANBLENDERHOME/source make 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 |