[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22445] branches/blender2.5/blender/source : Changed to able compile libsamplerate properly

[Joilnen Leite]

Revision: 22445
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22445
Author:   pidhash
Date:     2009-08-14 02:14:20 +0200 (Fri, 14 Aug 2009)

Log Message:
-----------
Changed to able compile libsamplerate properly

Modified Paths:
--------------
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/nan_definitions.mk

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2009-08-13 22:26:24 UTC (rev 22444)
+++ branches/blender2.5/blender/source/Makefile	2009-08-14 00:14:20 UTC (rev 22445)
@@ -109,7 +109,7 @@
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
-COMLIB += $(LCGDIR)/samplerate/lib/libsamplerate.a
+COMLIB += $(NAN_SAMPLERATE)/lib/libsamplerate.a
 
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a

Modified: branches/blender2.5/blender/source/nan_definitions.mk
===================================================================
--- branches/blender2.5/blender/source/nan_definitions.mk	2009-08-13 22:26:24 UTC (rev 22444)
+++ branches/blender2.5/blender/source/nan_definitions.mk	2009-08-14 00:14:20 UTC (rev 22445)
@@ -191,6 +191,9 @@
     # enable l10n
     export INTERNATIONAL ?= true
 
+    export NAN_SAMPLERATE ?= $(LCGDIR)/samplerate
+		export NAN_SAMPLERATE_LIBS ?= $(NAN_SAMPLERATE)/lib/libsamplerate.a 
+
   else
   ifeq ($(OS),freebsd)
 
@@ -309,6 +312,7 @@
     export NAN_SDL ?= $(shell sdl-config --prefix)
     export NAN_SDLLIBS ?= $(shell sdl-config --libs)
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
+    export NAN_SAMPLERATE ?= /usr
 
 ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
     export NAN_FFMPEG ?= /usr