diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_link.mk | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile index abb0f311174..e5efd87fb6e 100644 --- a/source/Makefile +++ b/source/Makefile @@ -106,6 +106,9 @@ COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a +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 ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index f60bdffa282..60ffdc78726 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -42,6 +42,7 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../../../intern/memutil +CPPFLAGS += -I$(NAN_AUDASPACE)/include # Reference to the types in makesdna and imbuf CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna diff --git a/source/blender/editors/space_sequencer/Makefile b/source/blender/editors/space_sequencer/Makefile index 7be0bc9cfef..2fb3de516b4 100644 --- a/source/blender/editors/space_sequencer/Makefile +++ b/source/blender/editors/space_sequencer/Makefile @@ -50,6 +50,7 @@ CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(NAN_AUDASPACE)/include # own include diff --git a/source/nan_link.mk b/source/nan_link.mk index 4e32366956a..3c84e62049b 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -97,6 +97,7 @@ ifeq ($(OS),linux) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread + LLIBS += -lsamplerate LOPTS = -export-dynamic DADD = -lGL -lGLU SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a |