[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31388] trunk/blender/source: More makefiles for new audaspace commit.
Ton Roosendaal
ton at blender.org
Mon Aug 16 19:07:59 CEST 2010
Revision: 31388
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31388
Author: ton
Date: 2010-08-16 19:07:59 +0200 (Mon, 16 Aug 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/Makefile
trunk/blender/source/blender/editors/sound/Makefile
trunk/blender/source/blender/editors/space_graph/Makefile
trunk/blender/source/blender/editors/space_sequencer/Makefile
trunk/blender/source/blender/editors/space_sound/Makefile
trunk/blender/source/blender/makesrna/intern/Makefile
Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -109,10 +109,12 @@
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
Modified: trunk/blender/source/blender/editors/sound/Makefile
===================================================================
--- trunk/blender/source/blender/editors/sound/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/blender/editors/sound/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -37,6 +37,8 @@
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+
CPPFLAGS += -I../../windowmanager
CPPFLAGS += -I../../blenkernel
CPPFLAGS += -I../../blenloader
Modified: trunk/blender/source/blender/editors/space_graph/Makefile
===================================================================
--- trunk/blender/source/blender/editors/space_graph/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/blender/editors/space_graph/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -37,6 +37,8 @@
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
Modified: trunk/blender/source/blender/editors/space_sequencer/Makefile
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/blender/editors/space_sequencer/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -38,6 +38,7 @@
CPPFLAGS += -I$(NAN_GLEW)/include
CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
# not very neat....
CPPFLAGS += -I../../windowmanager
Modified: trunk/blender/source/blender/editors/space_sound/Makefile
===================================================================
--- trunk/blender/source/blender/editors/space_sound/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/blender/editors/space_sound/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -38,6 +38,8 @@
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
Modified: trunk/blender/source/blender/makesrna/intern/Makefile
===================================================================
--- trunk/blender/source/blender/makesrna/intern/Makefile 2010-08-16 17:04:46 UTC (rev 31387)
+++ trunk/blender/source/blender/makesrna/intern/Makefile 2010-08-16 17:07:59 UTC (rev 31388)
@@ -45,6 +45,8 @@
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
More information about the Bf-blender-cvs
mailing list