2.5
authorTon Roosendaal <ton@blender.org>
Tue, 11 Aug 2009 18:14:49 +0000 (18:14 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 11 Aug 2009 18:14:49 +0000 (18:14 +0000)
Makefiles to get new AUD stuff to compile (OSX 10.3 PPC)
It uses lib/samplerate, which gets committed soon too

intern/audaspace/SRC/Makefile
intern/audaspace/intern/Makefile
source/gameengine/Converter/Makefile
source/gameengine/GamePlayer/common/Makefile
source/gameengine/Ketsji/Makefile
source/gameengine/Makefile

index 07804d3b37b8c1175d90220a640b2b7c2fe0f6bc..5cf5f55b11fe5bf18fb22cae02de960a4ef36c14 100644 (file)
@@ -35,6 +35,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL
index 85dbbf8aa52b44fe49fa696dde511cddae614fc9..2dcc7798f1c4195a74aa392383d7bfd1e4ab8841 100644 (file)
@@ -35,6 +35,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
 CPPFLAGS += -I../ffmpeg
 CPPFLAGS += -I../FX
 CPPFLAGS += -I../SDL
index 50bd851a1b05bc405662c280e474666cc13c9ee0..e261f9350e99527103ab174fd12f10d932224952 100644 (file)
@@ -40,6 +40,7 @@ CPPFLAGS += -I$(NAN_STRING)/include
 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
index 314295cae273087f931776477850eb3a0ab027da..e1b07a226f67728be0bc857823f1eb98a8446213 100644 (file)
@@ -52,6 +52,7 @@ CPPFLAGS += -I$(NAN_MOTO)/include
 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
index daa4c234076e6c56affe33a8e264c9478058bb18..0e9e657cc168031547db45ea89004beb26cbb2d5 100644 (file)
@@ -45,6 +45,8 @@ CPPFLAGS += -I../../blender/python/generic
 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
index 51bc0f7d39f4ce657d4a4455be3bc4261371e3be..bcb4b9098e75c4e0bd6095a924534f29d442ab68 100644 (file)
@@ -38,7 +38,7 @@ DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph
 DIRS += Network Physics VideoTexture
 
 ifeq ($(WITH_BF_BLENDERGAMEENGINE),true)
-  DIRS += GamePlayer
+#  DIRS += GamePlayer
 endif
 
 include nan_subdirs.mk