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 /intern/python | |
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 'intern/python')
-rwxr-xr-x | intern/python/freeze/freeze.py | 2 | ||||
-rw-r--r-- | intern/python/freeze/makemakefile.py | 5 |
2 files changed, 5 insertions, 2 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" % |