Hopefully update for NaN Makefiles for the moving of SoundSystem.

I need to get openal working on my machine before I can test it so
if it doesn't work feel free to fix it.  Hopefully this will be
the majority of the stuff though.

Kent

10 files changed, 27 insertions, 14 deletions

diff --git a/intern/Makefile b/intern/Makefile
index 04195ca8533..08ab03150fe 100644
--- a/intern/Makefile
+++ b/intern/Makefile
@@ -35,7 +35,7 @@ SOURCEDIR = intern
 # include nan_subdirs.mk
 
 ALLDIRS = string ghost guardedalloc bmfont moto container memutil
-ALLDIRS += decimation iksolver bsp
+ALLDIRS += decimation iksolver bsp SoundSystem
 
 all::
 	@for i in $(ALLDIRS); do \
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile
index 84c268bc10c..87afb6abb15 100644
--- a/intern/SoundSystem/Makefile
+++ b/intern/SoundSystem/Makefile
@@ -33,7 +33,8 @@
 
 include nan_definitions.mk
 
-SOURCEDIR = source/gameengine/SoundSystem
+LIBNAME = soundsystem
+SOURCEDIR = intern/SoundSystem
 DIR = $(OCGDIR)/SoundSystem
 DIRS = intern
 DIRS += dummy
@@ -55,3 +56,18 @@ ifeq ($(OS),$(findstring $(OS), "linux"))
 endif
 
 include nan_subdirs.mk
+
+install: all debug
+	@[ -d $(NAN_SOUNDSYSTEM) ] || mkdir $(NAN_SOUNDSYSTEM)
+	@[ -d $(NAN_SOUNDSYSTEM)/include ] || mkdir $(NAN_SOUNDSYSTEM)/include
+	@[ -d $(NAN_SOUNDSYSTEM)/lib ] || mkdir $(NAN_SOUNDSYSTEM)/lib
+	@[ -d $(NAN_SOUNDSYSTEM)/lib/debug ] || mkdir $(NAN_SOUNDSYSTEM)/lib/debug
+	@../tools/cpifdiff.sh $(DIR)/libsoundsystem.a $(NAN_SOUNDSYSTEM)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libsoundsystem.a $(NAN_SOUNDSYSTEM)/lib/debug/
+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/
+
+
diff --git a/intern/SoundSystem/SND_test/Makefile b/intern/SoundSystem/SND_test/Makefile
index 0aae4866f1c..bb317f2c8f6 100644
--- a/intern/SoundSystem/SND_test/Makefile
+++ b/intern/SoundSystem/SND_test/Makefile
@@ -32,7 +32,7 @@
 #
 
 LIBNAME = SoundSystem
-DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIR = $(OCGDIR)/intern/$(LIBNAME)
 ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)SoundSystem
 
 include nan_compile.mk
@@ -40,13 +40,12 @@ include nan_compile.mk
 CPPFLAGS += $(NAN_LEVEL_1_WARNINGS)
 
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I../../../kernel/gen_system
 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)/gameengine/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/dummy/Makefile b/intern/SoundSystem/dummy/Makefile
index fd2c85e7464..5d23d1a8a6a 100644
--- a/intern/SoundSystem/dummy/Makefile
+++ b/intern/SoundSystem/dummy/Makefile
@@ -32,7 +32,7 @@
 #
 
 LIBNAME = DummySoundSystem
-DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk
 
@@ -40,7 +40,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I../../../../kernel/gen_system
 CPPFLAGS += -I../intern
 CPPFLAGS += -I..
 CPPFLAGS += -I.
diff --git a/intern/SoundSystem/fmod/Makefile b/intern/SoundSystem/fmod/Makefile
index bb545c36e2d..d2810e8fa2f 100644
--- a/intern/SoundSystem/fmod/Makefile
+++ b/intern/SoundSystem/fmod/Makefile
@@ -32,7 +32,7 @@
 #
 
 LIBNAME = FmodSoundSystem
-DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk
 
@@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += -I$(NAN_FMOD)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../intern
 CPPFLAGS += -I..
 CPPFLAGS += -I.
diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile
index ae5805ad5bc..380a9748b70 100644
--- a/intern/SoundSystem/intern/Makefile
+++ b/intern/SoundSystem/intern/Makefile
@@ -32,7 +32,7 @@
 #
 
 LIBNAME = SoundSystem
-DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk
 
@@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += -I$(NAN_FMOD)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../../../blender/include
 CPPFLAGS += -I../dummy
 CPPFLAGS += -I../fmod
diff --git a/intern/SoundSystem/openal/Makefile b/intern/SoundSystem/openal/Makefile
index 277332abde6..edab68e8e4d 100644
--- a/intern/SoundSystem/openal/Makefile
+++ b/intern/SoundSystem/openal/Makefile
@@ -32,7 +32,7 @@
 #
 
 LIBNAME = OpenALSoundSystem
-DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk
 
@@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += -I$(NAN_OPENAL)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../intern
 CPPFLAGS += -I..
 CPPFLAGS += -I.
diff --git a/source/Makefile b/source/Makefile
index 459e98c11d3..2709fe9a107 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -77,6 +77,7 @@ PYPLAYERLIB ?= $(PYLIB)
     GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
     GRPLIB += $(NAN_DECIMATION)/lib/libdecimation.a
     GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
+    GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libsoundsystem.a
     GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
     GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
     GRPLIB += $(OCGDIR)/blender/img/$(DEBUG_DIR)libimg.a
diff --git a/source/gameengine/Makefile b/source/gameengine/Makefile
index 3111f3afbdd..efba2f83a3a 100644
--- a/source/gameengine/Makefile
+++ b/source/gameengine/Makefile
@@ -38,6 +38,6 @@ DIR = $(OCGDIR)/gameengine
 DIRS = BlenderRoutines
 DIRS += Converter
 DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph
-DIRS += SoundSystem Network GamePlayer Physics
+DIRS += Network GamePlayer Physics
 
 include nan_subdirs.mk
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index ecd1623576c..af7be1392ac 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -66,6 +66,7 @@ all debug::
     export NAN_GUARDEDALLOC ?= $(LCGDIR)/guardedalloc
     export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
     export NAN_BSP ?= $(LCGDIR)/bsp
+    export NAN_SOUNDSYSTEM ?= $(LCGDIR)/SoundSystem
     export NAN_STRING ?= $(LCGDIR)/string
     export NAN_MEMUTIL ?= $(LCGDIR)/memutil
     export NAN_CONTAINER ?= $(LCGDIR)/container