diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-07-12 04:46:43 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-07-12 04:46:43 +0400 |
| commit | 307586f03fa5bcfd0609cd2f2e0d91b64c022c50 (patch) | |
| tree | b120f28cb0648d034d3ad66f5b7a59dc29a4e8f5 | |
| parent | 70ee786960822d5b96ea6a545410c8997d7dea07 (diff) | |
EXPYTHON in now the only python for the Makefiles build.
| -rw-r--r-- | intern/Makefile | 5 | ||||
| -rw-r--r-- | source/Makefile | 6 | ||||
| -rw-r--r-- | source/blender/Makefile | 7 | ||||
| -rw-r--r-- | source/nan_link.mk | 4 |
4 files changed, 3 insertions, 19 deletions
diff --git a/intern/Makefile b/intern/Makefile index 41fd7010809..04195ca8533 100644 --- a/intern/Makefile +++ b/intern/Makefile @@ -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" ;\ diff --git a/source/Makefile b/source/Makefile index 96975fda5eb..459e98c11d3 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/blender/Makefile b/source/blender/Makefile index 28ff16ca141..afc215dad6e 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -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 diff --git a/source/nan_link.mk b/source/nan_link.mk index 9fe96b29b47..67c4edf8f60 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -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 |