diff options
| author | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-02-03 04:46:29 +0300 |
|---|---|---|
| committer | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-02-03 04:46:29 +0300 |
| commit | cdfeebb00f6c81187aa46f5ca31c0b1b03d4732a (patch) | |
| tree | feb9ad9eb73fb40993cc7990d50cd83a88528ae4 /source | |
| parent | 2ad6ec0a41a4836fe7c957888fe0314a308dfb91 (diff) | |
Change a freebsd and Linux/ppc case to first build blenderdynamic, and blenderstatic after that.
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Makefile b/source/Makefile index ffcafaa843f..feca7852a91 100644 --- a/source/Makefile +++ b/source/Makefile @@ -253,7 +253,8 @@ endif ifeq ($(OS),freebsd) ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0")) - BINTARGETS = blenderstatic + BINTARGETS = blenderdynamic + BINTARGETS += blenderstatic else BINTARGETS = blenderdynamic BINTARGETS += blenderplayer @@ -285,8 +286,8 @@ ifeq ($(OS),linux) BINTARGETS += blenderstatic endif ifeq ($(CPU),powerpc) - BINTARGETS = blenderstatic - BINTARGETS += blenderdynamic + BINTARGETS = blenderdynamic + BINTARGETS += blenderstatic endif PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a PYLIB += $(NAN_MXTEXTTOOLS) |