diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | intern/Makefile | 7 | ||||
| -rw-r--r-- | source/Makefile | 4 | ||||
| -rw-r--r-- | source/blender/Makefile | 8 | ||||
| -rw-r--r-- | source/blender/python/Makefile | 37 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Makefile | 54 |
6 files changed, 113 insertions, 2 deletions
@@ -35,8 +35,13 @@ # vars they can put it in the file user-def.mk which # will get included if it exists (please do not commit # user-def.mk to cvs). + sinclude user-def.mk +# To try the experimental new python stuff, uncomment the +# following line, or put it uncommented in user-def.mk: +# export EXPYTHON=true + export NANBLENDERHOME=$(shell pwd) MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory diff --git a/intern/Makefile b/intern/Makefile index 4e3b84c2bf1..8d38480e385 100644 --- a/intern/Makefile +++ b/intern/Makefile @@ -35,7 +35,12 @@ SOURCEDIR = intern # include nan_subdirs.mk ALLDIRS = string ghost guardedalloc bmfont moto container memutil -ALLDIRS += decimation iksolver keymaker bsp python/freeze +ALLDIRS += decimation iksolver keymaker bsp + +ifneq ($(EXPYTHON), true) + ALLDIRS += python/freeze +endif + all:: @for i in $(ALLDIRS); do \ diff --git a/source/Makefile b/source/Makefile index 1e6ac83ae1d..696bcf3a2b1 100644 --- a/source/Makefile +++ b/source/Makefile @@ -82,8 +82,12 @@ PYPLAYERLIB ?= $(PYLIB) GRPLIB += $(OCGDIR)/blender/img/$(DEBUG_DIR)libimg.a GRPLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a +ifeq ($(EXPYTHON), true) + GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a +else GRPLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.a GRPLIB += $(OCGDIR)/blender/bpython/libfrozen.a +endif # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some diff --git a/source/blender/Makefile b/source/blender/Makefile index f860b30881e..f06b91b4314 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -37,7 +37,13 @@ DIRS = blenloader DIRS += deflate inflate encrypt decrypt DIRS += writestreamglue readstreamglue writeblenfile readblenfile DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi -DIRS += bpython makesdna src renderconverter +DIRS += makesdna src renderconverter + +ifeq ($(EXPYTHON), true) + DIRS += python +else + DIRS += bpython +endif ifeq ($(INTERNATIONAL), true) DIRS += ftfont diff --git a/source/blender/python/Makefile b/source/blender/python/Makefile new file mode 100644 index 00000000000..149e40092f3 --- /dev/null +++ b/source/blender/python/Makefile @@ -0,0 +1,37 @@ +# +# $Id$ +# +# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# +# Bounces make to subdirectories. + +SOURCEDIR = source/blender/python +DIRS = api2_2x + +include nan_subdirs.mk diff --git a/source/blender/python/api2_2x/Makefile b/source/blender/python/api2_2x/Makefile new file mode 100644 index 00000000000..5b0e1cfef8d --- /dev/null +++ b/source/blender/python/api2_2x/Makefile @@ -0,0 +1,54 @@ +# +# $Id$ +# +# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# +# + +LIBNAME = python +DIR = $(OCGDIR)/blender/python + +CSRCS ?= $(wildcard *.c) $(wildcard ../*.c) + +include nan_compile.mk + +ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) + CFLAGS += -funsigned-char +endif + +CFLAGS += $(LEVEL_1_C_WARNINGS) + + +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../include +CPPFLAGS += -I$(NAN_BMFONT)/include +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) |