[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28913] trunk/blender/source/ nan_definitions.mk: Makefiles: fix building on linux/ppc

Stefan Gartner stefang at aon.at
Fri May 21 23:58:37 CEST 2010


Revision: 28913
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28913
Author:   sgefant
Date:     2010-05-21 23:58:37 +0200 (Fri, 21 May 2010)

Log Message:
-----------
Makefiles: fix building on linux/ppc

Modified Paths:
--------------
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2010-05-21 21:27:32 UTC (rev 28912)
+++ trunk/blender/source/nan_definitions.mk	2010-05-21 21:58:37 UTC (rev 28913)
@@ -133,13 +133,13 @@
   endif
 
   ifeq ($(WITH_JACK), true)
-    export NAN_JACK ?= /usr
+    export NAN_JACK ?= $(LCGDIR)/jack
     export NAN_JACKCFLAGS ?= -I$(NAN_JACK)/include/jack
     export NAN_JACKLIBS ?= $(NAN_JACK)/lib/libjack.a
   endif
 
   ifeq ($(WITH_SNDFILE),true)
-    export NAN_SNDFILE ?= /usr
+    export NAN_SNDFILE ?= $(LCGDIR)/sndfile
     export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
     export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a $(NAN_SNDFILE)/lib/libFLAC.a $(NAN_SNDFILE)/lib/libogg.a
   endif
@@ -158,9 +158,8 @@
     export BF_PCRE_LIBS ?= $(BF_PCRE)/lib/libpcre.a
   endif
 
-  export WITH_TIFF ?= true
-
-
+  export WITH_TIFF =? true
+  
   # Compare recreated .mo files with committed ones
   export BF_VERIFY_MO_FILES ?= true
 
@@ -371,7 +370,7 @@
     # enable l10n
     export INTERNATIONAL ?= true
 
-    # Different endianess will make it fail, rely on other plataforms for checks
+    # Different endianess will make it fail, rely on other platforms for checks
     export BF_VERIFY_MO_FILES = false
 
   else
@@ -441,6 +440,11 @@
       export WITH_FFMPEG ?= true
     endif
 
+    ifeq ($(CPU), powerpc)
+        # Different endianess will make it fail, rely on other platforms for checks
+        export BF_VERIFY_MO_FILES = false
+    endif
+
   else
   ifeq ($(OS),openbsd)
 





More information about the Bf-blender-cvs mailing list