EXPYTHON in now the only python for the Makefiles build.
This commit is contained in:
parent
70ee786960
commit
307586f03f
|
@ -37,11 +37,6 @@ SOURCEDIR = intern
|
|||
ALLDIRS = string ghost guardedalloc bmfont moto container memutil
|
||||
ALLDIRS += decimation iksolver bsp
|
||||
|
||||
ifneq ($(EXPYTHON), true)
|
||||
ALLDIRS += python/freeze
|
||||
endif
|
||||
|
||||
|
||||
all::
|
||||
@for i in $(ALLDIRS); do \
|
||||
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
|
||||
|
|
|
@ -82,12 +82,8 @@ 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
|
||||
|
|
|
@ -38,12 +38,7 @@ DIRS += deflate inflate
|
|||
DIRS += writestreamglue readstreamglue writeblenfile readblenfile
|
||||
DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi
|
||||
DIRS += makesdna src renderconverter
|
||||
|
||||
ifeq ($(EXPYTHON), true)
|
||||
DIRS += python
|
||||
else
|
||||
DIRS += bpython
|
||||
endif
|
||||
DIRS += python
|
||||
|
||||
ifeq ($(INTERNATIONAL), true)
|
||||
DIRS += ftfont
|
||||
|
|
|
@ -81,9 +81,7 @@ endif
|
|||
ifeq ($(OS),irix)
|
||||
LLIBS = -lmovieGL -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldmedia
|
||||
LLIBS += -lcl -laudio -ldb -lCio -lz
|
||||
ifeq ($(EXPYTHON), true)
|
||||
LLIBS += -lpthread
|
||||
endif
|
||||
LLIBS += -lpthread
|
||||
LLIBS += -woff 84,171
|
||||
DYNLDFLAGS = -shared $(LDFLAGS)
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue