[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22783] branches/blender2.5/blender: Update Makefile and missing include on voxeldata.c

[Diego Borghetti]

Revision: 22783
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22783
Author:   bdiego
Date:     2009-08-25 23:25:41 +0200 (Tue, 25 Aug 2009)

Log Message:
-----------
Update Makefile and missing include on voxeldata.c

Note that With libsndfile also need libflac and libogg here (Linux), right
now I just add this two librarys to the NAN_SNDFILELIBS, but maybe
it's better split this ? (NAN_FLAC/NAN_OGG)

Modified Paths:
--------------
    branches/blender2.5/blender/intern/audaspace/intern/Makefile
    branches/blender2.5/blender/source/blender/render/intern/source/Makefile
    branches/blender2.5/blender/source/blender/render/intern/source/voxeldata.c
    branches/blender2.5/blender/source/nan_definitions.mk

Modified: branches/blender2.5/blender/intern/audaspace/intern/Makefile
===================================================================
--- branches/blender2.5/blender/intern/audaspace/intern/Makefile	2009-08-25 21:07:52 UTC (rev 22782)
+++ branches/blender2.5/blender/intern/audaspace/intern/Makefile	2009-08-25 21:25:41 UTC (rev 22783)
@@ -47,7 +47,7 @@
 
 ifeq ($(WITH_JACK),true)
 	CPPFLAGS += -DWITH_JACK
-	CPPFLAGS += -I$(NAN_JACKCFLAGS)
+	CPPFLAGS += $(NAN_JACKCFLAGS)
 	CPPFLAGS += -I../jack
 endif
 
@@ -58,6 +58,7 @@
 
 ifeq ($(WITH_SNDFILE),true)
 	CPPFLAGS += -DWITH_SNDFILE
+	CPPFLAGS += -I../sndfile
 endif
 
 CPPFLAGS += -I$(LCGDIR)/samplerate/include/

Modified: branches/blender2.5/blender/source/blender/render/intern/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/render/intern/source/Makefile	2009-08-25 21:07:52 UTC (rev 22782)
+++ branches/blender2.5/blender/source/blender/render/intern/source/Makefile	2009-08-25 21:25:41 UTC (rev 22783)
@@ -50,6 +50,7 @@
 # not very neat: the rest of blender..
 CPPFLAGS += -I../../../editors/include 
 CPPFLAGS += $(NAN_SDLCFLAGS)
+CPPFLAGS += -I../../../../../intern/smoke/extern
 
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -DWITH_QUICKTIME

Modified: branches/blender2.5/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- branches/blender2.5/blender/source/blender/render/intern/source/voxeldata.c	2009-08-25 21:07:52 UTC (rev 22782)
+++ branches/blender2.5/blender/source/blender/render/intern/source/voxeldata.c	2009-08-25 21:25:41 UTC (rev 22783)
@@ -42,6 +42,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_modifier.h"
 
 #include "smoke_API.h"
 

Modified: branches/blender2.5/blender/source/nan_definitions.mk
===================================================================
--- branches/blender2.5/blender/source/nan_definitions.mk	2009-08-25 21:07:52 UTC (rev 22782)
+++ branches/blender2.5/blender/source/nan_definitions.mk	2009-08-25 21:25:41 UTC (rev 22783)
@@ -134,7 +134,7 @@
   ifeq ($(WITH_SNDFILE),true)
     export NAN_SNDFILE ?= /usr
     export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
-    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a
+    export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a $(NAN_SNDFILE)/lib/libFLAC.a $(NAN_SNDFILE)/lib/libogg.a
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)