diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-08-26 01:25:41 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-08-26 01:25:41 +0400 |
| commit | cfcd355c27ba1f923d04dec1f735989b260b190c (patch) | |
| tree | 169a68bfb13b4d9a4384af336272b2fa144554b0 /source | |
| parent | 91cd6fe2c4ff44f721e4ef1b3aa8f48a2ddb8501 (diff) | |
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)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile index 5d4a224002e..c313549f9b9 100644 --- a/source/blender/render/intern/source/Makefile +++ b/source/blender/render/intern/source/Makefile @@ -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 diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index ff076579788..f1f01f873a5 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -42,6 +42,7 @@ #include "BKE_global.h" #include "BKE_image.h" #include "BKE_main.h" +#include "BKE_modifier.h" #include "smoke_API.h" diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 50a606496f5..f8afc7f3fa6 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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) |