[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22377] branches/blender2.5/blender: 2.5

[Ton Roosendaal]

Revision: 22377
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22377
Author:   ton
Date:     2009-08-11 20:14:49 +0200 (Tue, 11 Aug 2009)

Log Message:
-----------
2.5

Makefiles to get new AUD stuff to compile (OSX 10.3 PPC)
It uses lib/samplerate, which gets committed soon too

Modified Paths:
--------------
    branches/blender2.5/blender/intern/audaspace/SRC/Makefile
    branches/blender2.5/blender/intern/audaspace/intern/Makefile
    branches/blender2.5/blender/source/gameengine/Converter/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
    branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
    branches/blender2.5/blender/source/gameengine/Makefile

Modified: branches/blender2.5/blender/intern/audaspace/SRC/Makefile
===================================================================
--- branches/blender2.5/blender/intern/audaspace/SRC/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/intern/audaspace/SRC/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -35,6 +35,7 @@
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL

Modified: branches/blender2.5/blender/intern/audaspace/intern/Makefile
===================================================================
--- branches/blender2.5/blender/intern/audaspace/intern/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/intern/audaspace/intern/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -35,6 +35,7 @@
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL

Modified: branches/blender2.5/blender/source/gameengine/Converter/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/source/gameengine/Converter/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -40,6 +40,7 @@
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BULLET2)/include
+CPPFLAGS += -I$(NAN_AUDASPACE)/include
 
 CPPFLAGS += -I../../blender
 # these two needed because of blenkernel

Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -52,6 +52,7 @@
 CPPFLAGS += -I$(NAN_PNG)/include
 CPPFLAGS += -I$(NAN_ZLIB)/include
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+CPPFLAGS += -I$(NAN_AUDASPACE)/include
 
 CPPFLAGS += -I../../../gameengine/Converter
 CPPFLAGS += -I../../../gameengine/Expressions

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -45,6 +45,8 @@
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BULLET2)/include
+CPPFLAGS += -I$(NAN_AUDASPACE)/include
+
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph
 CPPFLAGS += -I../BlenderRoutines -I../Expressions

Modified: branches/blender2.5/blender/source/gameengine/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Makefile	2009-08-11 17:51:45 UTC (rev 22376)
+++ branches/blender2.5/blender/source/gameengine/Makefile	2009-08-11 18:14:49 UTC (rev 22377)
@@ -38,7 +38,7 @@
 DIRS += Network Physics VideoTexture
 
 ifeq ($(WITH_BF_BLENDERGAMEENGINE),true)
-  DIRS += GamePlayer
+#  DIRS += GamePlayer
 endif
 
 include nan_subdirs.mk