Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2003-07-16 23:53:53 +0400
committerKent Mein <mein@cs.umn.edu>2003-07-16 23:53:53 +0400
commit6dcc5b030e1a6e66aed8504a2fbc2ab652b9ea91 (patch)
treefdac93db612eb1d542516c4fa2d89c8653eed965 /source/gameengine/GamePlayer
parent899a12a5cb043839ce1ae497ea4a3dec824e1867 (diff)
Further fixes to the old makefiles.
Kent
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r--source/gameengine/GamePlayer/common/Makefile2
-rw-r--r--source/gameengine/GamePlayer/common/unix/Makefile8
-rw-r--r--source/gameengine/GamePlayer/common/windows/Makefile2
-rw-r--r--source/gameengine/GamePlayer/ghost/Makefile3
4 files changed, 4 insertions, 11 deletions
diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile
index 1dfbe22c0ca..535c2efebcb 100644
--- a/source/gameengine/GamePlayer/common/Makefile
+++ b/source/gameengine/GamePlayer/common/Makefile
@@ -55,6 +55,7 @@ CPPFLAGS += -I$(NAN_SUMO)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I../../../gameengine/Converter
CPPFLAGS += -I../../../gameengine/Expressions
CPPFLAGS += -I../../../gameengine/GameLogic
@@ -65,7 +66,6 @@ CPPFLAGS += -I../../../gameengine/Network
CPPFLAGS += -I../../../gameengine/Network/LoopBackNetwork
CPPFLAGS += -I../../../gameengine/Rasterizer
CPPFLAGS += -I../../../gameengine/SceneGraph
-CPPFLAGS += -I../../../gameengine/SoundSystem
CPPFLAGS += -I../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
###############################
diff --git a/source/gameengine/GamePlayer/common/unix/Makefile b/source/gameengine/GamePlayer/common/unix/Makefile
index e246ebc3578..ce06ab98808 100644
--- a/source/gameengine/GamePlayer/common/unix/Makefile
+++ b/source/gameengine/GamePlayer/common/unix/Makefile
@@ -57,16 +57,10 @@ CPPFLAGS += -I../../../../gameengine/Network/LoopBackNetwork
CPPFLAGS += -I../../../../gameengine/Rasterizer
CPPFLAGS += -I../../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
CPPFLAGS += -I../../../../gameengine/SceneGraph
-ifeq ($(NAN_SND), OPENAL)
- CPPFLAGS += -I../../../../gameengine/SoundSystem
- CPPFLAGS += -I../../../../gameengine/SoundSystem/SND_OpenAL
-else
- CPPFLAGS += -I../../../../gameengine/SoundSystem
- CPPFLAGS += -I../../../../gameengine/SoundSystem/SND_Dummy
-endif
CPPFLAGS += -I$(NAN_FUZZICS)/include
CPPFLAGS += -I$(NAN_SUMO)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
diff --git a/source/gameengine/GamePlayer/common/windows/Makefile b/source/gameengine/GamePlayer/common/windows/Makefile
index 03155dd894a..6ad97c1677c 100644
--- a/source/gameengine/GamePlayer/common/windows/Makefile
+++ b/source/gameengine/GamePlayer/common/windows/Makefile
@@ -43,7 +43,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(SRCHOME)/gameengine/GameLogic
CPPFLAGS += -I$(SRCHOME)/gameengine/Rasterizer
CPPFLAGS += -I$(SRCHOME)/gameengine/Ketsji
-CPPFLAGS += -I$(SRCHOME)/gameengine/SoundSystem
CPPFLAGS += -I$(SRCHOME)/gameengine/Network
CPPFLAGS += -I$(SRCHOME)/gameengine/Network/LoopBackNetwork
@@ -53,6 +52,7 @@ CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
# Blender stuff
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile
index 1d75afc0389..857b274cbae 100644
--- a/source/gameengine/GamePlayer/ghost/Makefile
+++ b/source/gameengine/GamePlayer/ghost/Makefile
@@ -42,6 +42,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I../../GamePlayer/common
@@ -56,8 +57,6 @@ CPPFLAGS += -I../../Network/LoopBackNetwork
CPPFLAGS += -I../../Rasterizer
CPPFLAGS += -I../../Rasterizer/RAS_OpenGLRasterizer
CPPFLAGS += -I../../SceneGraph
-CPPFLAGS += -I../../SoundSystem
-CPPFLAGS += -I../../SoundSystem/SND_OpenAL
# Sumo
CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include