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
This commit is contained in:
@@ -2,9 +2,11 @@
|
|||||||
# This is the makefile for the bytecode freezing of all modules which
|
# This is the makefile for the bytecode freezing of all modules which
|
||||||
# the main file depends on (last argument in importer rule)
|
# the main file depends on (last argument in importer rule)
|
||||||
|
|
||||||
|
include nan_definitions.mk
|
||||||
|
|
||||||
SRCDIR = ../modules
|
SRCDIR = ../modules
|
||||||
|
|
||||||
TARGETDIR = ../../../source/blender/bpython/frozen
|
TARGETDIR = $(OCGDIR)/blender/bpython/frozen
|
||||||
|
|
||||||
PYFLAGS = -S -O
|
PYFLAGS = -S -O
|
||||||
|
|
||||||
@@ -13,7 +15,9 @@ default: importer
|
|||||||
install: importer
|
install: importer
|
||||||
|
|
||||||
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:
|
clean:
|
||||||
rm *.pyo
|
rm *.pyo
|
||||||
|
@@ -32,6 +32,6 @@
|
|||||||
# Bounces make to subdirectories.
|
# Bounces make to subdirectories.
|
||||||
|
|
||||||
SOURCEDIR = source/blender/bpython
|
SOURCEDIR = source/blender/bpython
|
||||||
DIRS = intern frozen
|
DIRS = intern
|
||||||
|
|
||||||
include nan_subdirs.mk
|
include nan_subdirs.mk
|
||||||
|
@@ -42,7 +42,7 @@ endif
|
|||||||
|
|
||||||
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
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
|
#CPPFLAGS += -DNO_RELEASE # see api.h for configuration
|
||||||
|
|
||||||
# OpenGL and Python
|
# OpenGL and Python
|
||||||
|
Reference in New Issue
Block a user