Further fixes to the old makefiles.
authorKent Mein <mein@cs.umn.edu>
Wed, 16 Jul 2003 19:53:53 +0000 (19:53 +0000)
committerKent Mein <mein@cs.umn.edu>
Wed, 16 Jul 2003 19:53:53 +0000 (19:53 +0000)
Kent

12 files changed:
intern/SoundSystem/Makefile
intern/SoundSystem/SND_test/Makefile
intern/SoundSystem/intern/Makefile
source/blender/src/Makefile
source/gameengine/BlenderRoutines/Makefile
source/gameengine/Converter/Makefile
source/gameengine/GamePlayer/common/Makefile
source/gameengine/GamePlayer/common/unix/Makefile
source/gameengine/GamePlayer/common/windows/Makefile
source/gameengine/GamePlayer/ghost/Makefile
source/gameengine/Ketsji/Makefile
source/gameengine/Physics/common/Makefile

index 87afb6abb1535aa65995f164bed74332da041c2e..4273b3380f9c7ffe445485e83ee5dc5be01dd16f 100644 (file)
@@ -35,7 +35,7 @@ include nan_definitions.mk
 
 LIBNAME = soundsystem
 SOURCEDIR = intern/SoundSystem
-DIR = $(OCGDIR)/SoundSystem
+DIR = $(OCGDIR)/$(SOURCEDIR)
 DIRS = intern
 DIRS += dummy
 
@@ -68,6 +68,6 @@ ifeq ($(OS),darwin)
        ranlib $(NAN_SOUNDSYSTEM)/lib/libsoundsystem.a
        ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libsoundsystem.a
 endif
-       @../tools/cpifdiff.sh extern/*.h $(NAN_SOUNDSYSTEM)/include/
+       @../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/
 
 
index bb317f2c8f630e6e9098395df29506c40d2fd406..2fc531ae37e91a1bc9408ab1254d11b949a60100 100644 (file)
@@ -31,8 +31,8 @@
 #
 #
 
-LIBNAME = SoundSystem
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = soundsystem
+DIR = $(OCGDIR)/intern/SoundSystem
 ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)SoundSystem
 
 include nan_compile.mk
@@ -44,8 +44,7 @@ CPPFLAGS += -I.. -I../SND_BlenderWaveCache -I../SND_OpenAL
 
 TESTLIB = $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
 TESTLIB += $(OCGDIR)/gameengine/BlenderWaveCache/$(DEBUG_DIR)libBlenderWaveCache.a
-TESTLIB += $(OCGDIR)/kernel/gen_system/$(DEBUG_DIR)libgen_system.a
-TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libsoundsystem.a
 TESTLIB += $(NAN_OPENAL)/lib/libopenal.a
 
 $(DIR)/$(DEBUG_DIR)SoundSystem: $(OBJS) $(TESTLIB)
index 380a9748b7020c0c5ca5982eae228710d1678f18..252c6c022fe9103ef3a4dfc308d86593d78a31c5 100644 (file)
@@ -31,8 +31,8 @@
 #
 #
 
-LIBNAME = SoundSystem
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = soundsystem
+DIR = $(OCGDIR)/intern/SoundSystem
 
 include nan_compile.mk
 
index 6737d942eedfed3095d99e2321f2244bb6842ef3..be76b28da29a13a0339d70da9cab5e845070353c 100644 (file)
@@ -59,6 +59,7 @@ endif
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_GHOST)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 
 # External interfaces of modules:
 CPPFLAGS += -I../render/extern/include
index c9507130ef59fd09c9e51b7359b5fd1ba8f5acb6..5bc924f642d39fe9a574b1ccd1e9978dd6ef45e7 100644 (file)
@@ -44,6 +44,7 @@ CPPFLAGS += -I$(NAN_STRING)/include
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_FUZZICS)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 # because of kernel dependency on makesdna
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/include
@@ -61,7 +62,6 @@ CPPFLAGS += -I../Ketsji
 CPPFLAGS += -I../Rasterizer
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../SceneGraph
-CPPFLAGS += -I../SoundSystem
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../Network
 CPPFLAGS += -I../Network/LoopBackNetwork
index ffcdf8a0693e8e56af42e2402a164a331c056ae5..7340e933a25a7b1e67e6845aa3dad98df9e3aee1 100644 (file)
@@ -40,6 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_STRING)/include    
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../blender
@@ -51,7 +52,7 @@ CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/blenkernel
 CPPFLAGS += -I../../blender/render/extern/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
-CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic -I../SoundSystem
+CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic
 CPPFLAGS += -I../Ketsji -I../BlenderRoutines -I../SceneGraph
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
index 1dfbe22c0ca469cbb6442d2d70a829fb6aaa735d..535c2efebcbdfb9d43eb17d33fe9607798a876c6 100644 (file)
@@ -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
 
 ###############################
index e246ebc3578af5f4d434df453d759d3cb87367b8..ce06ab988087f1dcd73b05fd3dd7378dd7bc4aff 100644 (file)
@@ -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
 
index 03155dd894a1c00b3505cd27a893323c0415c0c4..6ad97c1677c8905697c09563a83d50cc59fc4803 100644 (file)
@@ -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
index 1d75afc0389ef59c4c82c660dad09681c34d0a4c..857b274cbae4ae8510aa47e3f3b55e3bfd9be081 100644 (file)
@@ -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
index 1c11d7ca4c57e1182035fa595e46029b8fe90f7d..3884be14ded7923984cca2f137f843b9d13ac24e 100644 (file)
@@ -41,9 +41,10 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += $(OGL_CPPFLAGS)
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_STRING)/include    
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
 CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph
-CPPFLAGS += -I../BlenderRoutines -I../SoundSystem -I../Expressions
+CPPFLAGS += -I../BlenderRoutines -I../Expressions
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../Network -IKXNetwork
 CPPFLAGS += -I../Physics/common
index a9f43aeb5a7c2e51126a5c8aeda83103e2a1cbb2..e0f72571c961af92634ebb8b0e39343cdd754b6e 100644 (file)
@@ -39,7 +39,8 @@ include nan_compile.mk
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
-CPPFLAGS += -I$(NAN_STRING)/include    
+CPPFLAGS += -I$(NAN_STRING)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
@@ -51,7 +52,7 @@ CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/blenkernel
 CPPFLAGS += -I../../blender/render/extern/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
-CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic -I../SoundSystem
+CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic
 CPPFLAGS += -I../Ketsji -I../BlenderRoutines -I../SceneGraph
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer