Change a freebsd and Linux/ppc case to first build blenderdynamic, and blenderstatic...
authorWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>
Mon, 3 Feb 2003 01:46:29 +0000 (01:46 +0000)
committerWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>
Mon, 3 Feb 2003 01:46:29 +0000 (01:46 +0000)
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.

source/Makefile

index ffcafaa843f3a27af7b1fe4f2a359e877b4be059..feca7852a91088068ebe36b25f17794b311bbed0 100644 (file)
@@ -253,7 +253,8 @@ endif
 
 ifeq ($(OS),freebsd)
   ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
 
 ifeq ($(OS),freebsd)
   ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
-    BINTARGETS = blenderstatic
+    BINTARGETS = blenderdynamic
+    BINTARGETS += blenderstatic
   else
     BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
   else
     BINTARGETS = blenderdynamic
     BINTARGETS += blenderplayer
@@ -285,8 +286,8 @@ ifeq ($(OS),linux)
     BINTARGETS += blenderstatic
   endif
   ifeq ($(CPU),powerpc)
     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)
   endif
     PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     PYLIB += $(NAN_MXTEXTTOOLS)