diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-08-16 21:07:59 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-08-16 21:07:59 +0400 |
| commit | dc3ca6dcdad25529b314bfbdaae72f7aff850edf (patch) | |
| tree | 77f9219b33343b48ddcf9562c31695d7519b4120 | |
| parent | 7fc5f78b15ada4d0ad6a5858a1fa98d7ef33f6ee (diff) | |
More makefiles for new audaspace commit.
Jorg: you have added an include Python.h in the AUD api.h. I'm not
sure if it's smart to have this, it makes all AUD code depend on
resolving the Python path.
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/editors/sound/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_sound/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/Makefile | 2 |
6 files changed, 11 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile index ece5b6d8bba..cd8d826705e 100644 --- a/source/Makefile +++ b/source/Makefile @@ -109,10 +109,12 @@ 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 += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.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 COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_python.a COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a diff --git a/source/blender/editors/sound/Makefile b/source/blender/editors/sound/Makefile index 211fcfb9a4c..f51e15627a2 100644 --- a/source/blender/editors/sound/Makefile +++ b/source/blender/editors/sound/Makefile @@ -37,6 +37,8 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + CPPFLAGS += -I../../windowmanager CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenloader diff --git a/source/blender/editors/space_graph/Makefile b/source/blender/editors/space_graph/Makefile index 633242355f0..1ac744af239 100644 --- a/source/blender/editors/space_graph/Makefile +++ b/source/blender/editors/space_graph/Makefile @@ -37,6 +37,8 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_AUDASPACE)/include diff --git a/source/blender/editors/space_sequencer/Makefile b/source/blender/editors/space_sequencer/Makefile index bb1cbdf1cd3..bd2b837d499 100644 --- a/source/blender/editors/space_sequencer/Makefile +++ b/source/blender/editors/space_sequencer/Makefile @@ -38,6 +38,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # not very neat.... CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/space_sound/Makefile b/source/blender/editors/space_sound/Makefile index 03764c97a96..9afda815f59 100644 --- a/source/blender/editors/space_sound/Makefile +++ b/source/blender/editors/space_sound/Makefile @@ -38,6 +38,8 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + # not very neat.... CPPFLAGS += -I../../windowmanager CPPFLAGS += -I../../blenloader diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile index f4ab4712faa..69d5581184d 100644 --- a/source/blender/makesrna/intern/Makefile +++ b/source/blender/makesrna/intern/Makefile @@ -45,6 +45,8 @@ endif CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_MEMUTIL)/include CPPFLAGS += -I../../../../intern/audaspace/intern |