diff options
-rw-r--r-- | intern/SoundSystem/Makefile | 4 | ||||
-rw-r--r-- | intern/SoundSystem/SND_test/Makefile | 7 | ||||
-rw-r--r-- | intern/SoundSystem/intern/Makefile | 4 | ||||
-rw-r--r-- | source/blender/src/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Converter/Makefile | 3 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/unix/Makefile | 8 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/windows/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/Makefile | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 3 | ||||
-rw-r--r-- | source/gameengine/Physics/common/Makefile | 5 |
12 files changed, 20 insertions, 24 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 87afb6abb15..4273b3380f9 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -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/ diff --git a/intern/SoundSystem/SND_test/Makefile b/intern/SoundSystem/SND_test/Makefile index bb317f2c8f6..2fc531ae37e 100644 --- a/intern/SoundSystem/SND_test/Makefile +++ b/intern/SoundSystem/SND_test/Makefile @@ -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) diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile index 380a9748b70..252c6c022fe 100644 --- a/intern/SoundSystem/intern/Makefile +++ b/intern/SoundSystem/intern/Makefile @@ -31,8 +31,8 @@ # # -LIBNAME = SoundSystem -DIR = $(OCGDIR)/intern/$(LIBNAME) +LIBNAME = soundsystem +DIR = $(OCGDIR)/intern/SoundSystem include nan_compile.mk diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 6737d942eed..be76b28da29 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -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 diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index c9507130ef5..5bc924f642d 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -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 diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index ffcdf8a0693..7340e933a25 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -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 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 diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index 1c11d7ca4c5..3884be14ded 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -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 diff --git a/source/gameengine/Physics/common/Makefile b/source/gameengine/Physics/common/Makefile index a9f43aeb5a7..e0f72571c96 100644 --- a/source/gameengine/Physics/common/Makefile +++ b/source/gameengine/Physics/common/Makefile @@ -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 |