archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

I autmated the rest of building libfrozen.a

Browse Source 
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
This commit is contained in:
Kent Mein
2002-11-07 17:47:15 +00:00
parent 2c183d2da7
commit e46a6d2611
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/python/freeze/freeze.py
View File

@@ -124,7 +124,7 @@ def main():
frozen_c = 'frozen.c' frozen_c = 'frozen.c'
config_c = 'config.c' config_c = 'config.c'
target = 'a.out' # normally derived from script name target = 'a.out' # normally derived from script name
makefile = 'Makefile.freeze' makefile = 'Makefile'
subsystem = 'console' subsystem = 'console'
# parse command line by first replacing any "-i" options with the file contents. # parse command line by first replacing any "-i" options with the file contents.

5
intern/python/freeze/makemakefile.py
View File

@@ -24,6 +24,8 @@ def makemakefile(outfp, makevars, files, target):
keys.sort() keys.sort()
for key in keys: for key in keys:
outfp.write("%s=%s\n" % (key, makevars[key])) outfp.write("%s=%s\n" % (key, makevars[key]))
outfp.write("\n\ninclude nan_definitions.mk\n")
outfp.write("\nall: %s\n\n" % libtarget) outfp.write("\nall: %s\n\n" % libtarget)
deps = [] deps = []
@@ -48,7 +50,8 @@ def makemakefile(outfp, makevars, files, target):
# libfiles.remove('M___main__.o') # don't link with __main__ # libfiles.remove('M___main__.o') # don't link with __main__
outfp.write("\n%s: $(OBJS)\n" % (libtarget)) 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("\n%s: %s $(OBJS)\n" % (target, mainfile))
outfp.write("\t$(CC) %s %s -o %s $(LDLAST)\n" % outfp.write("\t$(CC) %s %s -o %s $(LDLAST)\n" %

4
readme.txt
View File

@@ -46,8 +46,8 @@ After that cd $NANBLENDERHOME/intern
make make
make install make install
cd $NANBLENDERHOME/source/blender/bpython/frozen cd $NANBLENDERHOME/source/ode
make -f Makefile.freeze Look at the README_BLENDER and follow instructions
Then cd $NANBLENDERHOME/source Then cd $NANBLENDERHOME/source
make make

25
source/Makefile
View File

@@ -44,17 +44,18 @@ ifeq ($(OS),windows)
DIRS += icons DIRS += icons
endif endif
ifeq ($(OS),solaris) # Commented out by mein this is the moble phone stuff.
ifeq ($(CPU),sparc) #ifeq ($(OS),solaris)
DIRS += ssr # ifeq ($(CPU),sparc)
endif # DIRS += ssr
endif # endif
#endif
ifeq ($(OS),freebsd) #
ifeq ($(OS_VERSION),4.5) #ifeq ($(OS),freebsd)
DIRS += ssr # ifeq ($(OS_VERSION),4.5)
endif # DIRS += ssr
endif # endif
#endif
########## buildinfo kludge ################### ########## buildinfo kludge ###################
CPPFLAGS += -I../Physics/common CPPFLAGS += -I../Physics/common
@@ -98,7 +99,7 @@ PYPLAYERLIB ?= $(PYLIB)
GRCLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a GRCLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a
GRCLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRCLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
GRCLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.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)/creator/$(DEBUG_DIR)libcreator.a
GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a

2
source/blender/bpython/Makefile
View File

@@ -32,6 +32,6 @@
# Bounces make to subdirectories. # Bounces make to subdirectories.
SOURCEDIR = source/blender/bpython SOURCEDIR = source/blender/bpython
DIRS = intern DIRS = frozen intern
include nan_subdirs.mk include nan_subdirs.mk