forked from bartvdbraak/blender
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)
This commit is contained in:
parent
91cd6fe2c4
commit
cfcd355c27
@ -47,7 +47,7 @@ endif
|
|||||||
|
|
||||||
ifeq ($(WITH_JACK),true)
|
ifeq ($(WITH_JACK),true)
|
||||||
CPPFLAGS += -DWITH_JACK
|
CPPFLAGS += -DWITH_JACK
|
||||||
CPPFLAGS += -I$(NAN_JACKCFLAGS)
|
CPPFLAGS += $(NAN_JACKCFLAGS)
|
||||||
CPPFLAGS += -I../jack
|
CPPFLAGS += -I../jack
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -58,6 +58,7 @@ endif
|
|||||||
|
|
||||||
ifeq ($(WITH_SNDFILE),true)
|
ifeq ($(WITH_SNDFILE),true)
|
||||||
CPPFLAGS += -DWITH_SNDFILE
|
CPPFLAGS += -DWITH_SNDFILE
|
||||||
|
CPPFLAGS += -I../sndfile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CPPFLAGS += -I$(LCGDIR)/samplerate/include/
|
CPPFLAGS += -I$(LCGDIR)/samplerate/include/
|
||||||
|
@ -50,6 +50,7 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
|||||||
# not very neat: the rest of blender..
|
# not very neat: the rest of blender..
|
||||||
CPPFLAGS += -I../../../editors/include
|
CPPFLAGS += -I../../../editors/include
|
||||||
CPPFLAGS += $(NAN_SDLCFLAGS)
|
CPPFLAGS += $(NAN_SDLCFLAGS)
|
||||||
|
CPPFLAGS += -I../../../../../intern/smoke/extern
|
||||||
|
|
||||||
ifeq ($(WITH_QUICKTIME), true)
|
ifeq ($(WITH_QUICKTIME), true)
|
||||||
CPPFLAGS += -DWITH_QUICKTIME
|
CPPFLAGS += -DWITH_QUICKTIME
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_global.h"
|
#include "BKE_global.h"
|
||||||
#include "BKE_image.h"
|
#include "BKE_image.h"
|
||||||
#include "BKE_main.h"
|
#include "BKE_main.h"
|
||||||
|
#include "BKE_modifier.h"
|
||||||
|
|
||||||
#include "smoke_API.h"
|
#include "smoke_API.h"
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ ifndef CONFIG_GUESS
|
|||||||
ifeq ($(WITH_SNDFILE),true)
|
ifeq ($(WITH_SNDFILE),true)
|
||||||
export NAN_SNDFILE ?= /usr
|
export NAN_SNDFILE ?= /usr
|
||||||
export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
|
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
|
endif
|
||||||
|
|
||||||
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
|
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
|
||||||
|
Loading…
Reference in New Issue
Block a user