From 3bf8d2aa0cb57ffdeb7f3c18ee0ecd17738ac9a8 Mon Sep 17 00:00:00 2001 From: Wouter van Heyst Date: Sun, 26 Jan 2003 02:42:22 +0000 Subject: [PATCH] Get the Blender module back using the traditional makefiles, other build systems (auto, msvc, PB) do not seem to have this problem. - Change intern/python/freeze/Makefile to freeze outside of the source/ tree - Change source/blender/bpython/Makefile to not build the frozen stuff anymore - Change source/blender/bpython/intern/Makefile to use CURRENT_PYTHON_API instead of FUTURE_PYTHON_API, damage control --- intern/python/freeze/Makefile | 8 ++++++-- source/blender/bpython/Makefile | 2 +- source/blender/bpython/intern/Makefile | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/intern/python/freeze/Makefile b/intern/python/freeze/Makefile index cb364b0cdeb..8318568a4d2 100644 --- a/intern/python/freeze/Makefile +++ b/intern/python/freeze/Makefile @@ -2,9 +2,11 @@ # This is the makefile for the bytecode freezing of all modules which # the main file depends on (last argument in importer rule) +include nan_definitions.mk + SRCDIR = ../modules -TARGETDIR = ../../../source/blender/bpython/frozen +TARGETDIR = $(OCGDIR)/blender/bpython/frozen PYFLAGS = -S -O @@ -13,7 +15,9 @@ default: importer install: importer importer: - python $(PYFLAGS) freeze.py -d -x os -x pprint -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py + @[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR) + python $(PYFLAGS) freeze.py -d -x os -x pprint -x string -x copy -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py + $(MAKE) -C $(TARGETDIR) clean: rm *.pyo diff --git a/source/blender/bpython/Makefile b/source/blender/bpython/Makefile index fad66fbaec5..ef58948bd88 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 frozen +DIRS = intern include nan_subdirs.mk diff --git a/source/blender/bpython/intern/Makefile b/source/blender/bpython/intern/Makefile index b6c84196f4d..99071110fc0 100644 --- a/source/blender/bpython/intern/Makefile +++ b/source/blender/bpython/intern/Makefile @@ -42,7 +42,7 @@ endif CFLAGS += $(LEVEL_1_C_WARNINGS) -CPPFLAGS += -DFUTURE_PYTHON_API # see api.h for configuration +CPPFLAGS += -DCURRENT_PYTHON_API # see api.h for configuration #CPPFLAGS += -DNO_RELEASE # see api.h for configuration # OpenGL and Python