archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Change a freebsd and Linux/ppc case to first build blenderdynamic, and blenderstatic after that.

Browse Source 
This works around tinderbox bailing out on static and thus burning, the static
build still breaks but we're not checking that in tinderbox yet.
This commit is contained in:
Wouter van Heyst
2003-02-03 01:46:29 +00:00
parent 2ad6ec0a41
commit cdfeebb00f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/Makefile
View File

@@ -253,7 +253,8 @@ endif
ifeq ($(OS),freebsd) ifeq ($(OS),freebsd)
ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0")) ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
BINTARGETS = blenderstatic BINTARGETS = blenderdynamic
BINTARGETS += blenderstatic
else else
BINTARGETS = blenderdynamic BINTARGETS = blenderdynamic
BINTARGETS += blenderplayer BINTARGETS += blenderplayer
@@ -285,8 +286,8 @@ ifeq ($(OS),linux)
BINTARGETS += blenderstatic BINTARGETS += blenderstatic
endif endif
ifeq ($(CPU),powerpc) ifeq ($(CPU),powerpc)
BINTARGETS = blenderstatic BINTARGETS = blenderdynamic
BINTARGETS += blenderdynamic BINTARGETS += blenderstatic
endif endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_MXTEXTTOOLS) PYLIB += $(NAN_MXTEXTTOOLS)