diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-08-11 22:14:49 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-08-11 22:14:49 +0400 |
| commit | d8dc1b9fd4784215c5c5530fd7a7bf80f06179d3 (patch) | |
| tree | d05edc7dd9db6f471d53567042b6784fa9b8d2d7 | |
| parent | 75fe900c9c254148d0d03f74c11b3670eae577cc (diff) | |
2.5
Makefiles to get new AUD stuff to compile (OSX 10.3 PPC)
It uses lib/samplerate, which gets committed soon too
| -rw-r--r-- | intern/audaspace/SRC/Makefile | 1 | ||||
| -rw-r--r-- | intern/audaspace/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/Makefile | 2 | ||||
| -rw-r--r-- | source/gameengine/Makefile | 2 |
6 files changed, 7 insertions, 1 deletions
diff --git a/intern/audaspace/SRC/Makefile b/intern/audaspace/SRC/Makefile index 07804d3b37b..5cf5f55b11f 100644 --- a/intern/audaspace/SRC/Makefile +++ b/intern/audaspace/SRC/Makefile @@ -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 diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile index 85dbbf8aa52..2dcc7798f1c 100644 --- a/intern/audaspace/intern/Makefile +++ b/intern/audaspace/intern/Makefile @@ -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 diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 50bd851a1b0..e261f9350e9 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -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 diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index 314295cae27..e1b07a226f6 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -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 diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index daa4c234076..0e9e657cc16 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -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 diff --git a/source/gameengine/Makefile b/source/gameengine/Makefile index 51bc0f7d39f..bcb4b9098e7 100644 --- a/source/gameengine/Makefile +++ b/source/gameengine/Makefile @@ -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 |