Update Makefile and missing include on voxeldata.c
authorDiego Borghetti <bdiego@gmail.com>
Tue, 25 Aug 2009 21:25:41 +0000 (21:25 +0000)
committerDiego Borghetti <bdiego@gmail.com>
Tue, 25 Aug 2009 21:25:41 +0000 (21:25 +0000)
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)

intern/audaspace/intern/Makefile
source/blender/render/intern/source/Makefile
source/blender/render/intern/source/voxeldata.c
source/nan_definitions.mk

index a99f44c54d74daa0f6944c50857b485504bbc8ed..4bdca04c1cb440d29d4c026e1a9f561ef9b98e30 100644 (file)
@@ -47,7 +47,7 @@ endif
 
 ifeq ($(WITH_JACK),true)
        CPPFLAGS += -DWITH_JACK
-       CPPFLAGS += -I$(NAN_JACKCFLAGS)
+       CPPFLAGS += $(NAN_JACKCFLAGS)
        CPPFLAGS += -I../jack
 endif
 
@@ -58,6 +58,7 @@ endif
 
 ifeq ($(WITH_SNDFILE),true)
        CPPFLAGS += -DWITH_SNDFILE
+       CPPFLAGS += -I../sndfile
 endif
 
 CPPFLAGS += -I$(LCGDIR)/samplerate/include/
index 5d4a224002e596efadec5b38772da5927a0e7fb3..c313549f9b94453126e60b42a966d80d652062f6 100644 (file)
@@ -50,6 +50,7 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 # 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
index ff0765797885a71db54de2f87703da09169c7d33..f1f01f873a5200162fedd7c527e2c1a4355ab819 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
+#include "BKE_modifier.h"
 
 #include "smoke_API.h"
 
index 50a606496f54eb15a0856c69cdeac80a0494330e..f8afc7f3fa68e52abd71c449c0a952b6f2631e9a 100644 (file)
@@ -134,7 +134,7 @@ ifndef CONFIG_GUESS
   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)