- glue top level makefile and release one together
- fix 8 spaces problem in release/Makefile
This commit is contained in:
7
Makefile
7
Makefile
@@ -2,7 +2,12 @@
|
|||||||
|
|
||||||
export NANBLENDERHOME=$(shell pwd)
|
export NANBLENDERHOME=$(shell pwd)
|
||||||
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
|
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
|
||||||
include source/nan_subdirs.mk
|
|
||||||
|
|
||||||
SOURCEDIR = blender
|
SOURCEDIR = blender
|
||||||
DIRS = extern intern source
|
DIRS = extern intern source
|
||||||
|
include source/nan_subdirs.mk
|
||||||
|
|
||||||
|
.PHONY: release
|
||||||
|
release:
|
||||||
|
@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
|
||||||
|
$(MAKE) -C $@ $@ || exit 1;
|
||||||
|
@@ -36,6 +36,8 @@ export VERSION := $(shell cat VERSION)
|
|||||||
BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
|
BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
|
||||||
export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
|
export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
|
||||||
|
|
||||||
|
release: all
|
||||||
|
|
||||||
all:
|
all:
|
||||||
ifeq ($(OS),beos)
|
ifeq ($(OS),beos)
|
||||||
@$(MAKE) pkg TYPE="" TAR="zip -ry9" EXT1=".zip" NOPLUGINS="true"
|
@$(MAKE) pkg TYPE="" TAR="zip -ry9" EXT1=".zip" NOPLUGINS="true"
|
||||||
@@ -114,19 +116,19 @@ install: package
|
|||||||
ifeq ($(TYPE),-static)
|
ifeq ($(TYPE),-static)
|
||||||
@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
|
@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
|
||||||
else
|
else
|
||||||
ifeq ($(OS),darwin)
|
ifeq ($(OS),darwin)
|
||||||
@cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
|
@cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
|
||||||
else
|
else
|
||||||
@cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
|
@cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq ($(NOSTRIP),true)
|
ifneq ($(NOSTRIP),true)
|
||||||
@echo "----> Strip blender executable"
|
@echo "----> Strip blender executable"
|
||||||
ifeq ($(OS),darwin)
|
ifeq ($(OS),darwin)
|
||||||
@strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
|
@strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
|
||||||
else
|
else
|
||||||
@strip $(DISTDIR)/blender$(EXT0)
|
@strip $(DISTDIR)/blender$(EXT0)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
|
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
|
||||||
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
|
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
|
||||||
|
Reference in New Issue
Block a user