Add jack subdir makefile and standarize audaspace sub-lib names.

Jack support not enabled for now.

diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile
index 7bcdb3f6fd53844016ca7df72972ae02e7f1fbd9..e36b2de41fea340c051ce8962037446baeb798a4 100644 (file)
--- a/intern/audaspace/SDL/Makefile
+++ b/intern/audaspace/SDL/Makefile
@@ -28,7 +28,7 @@
 #
 #
 
-LIBNAME = SDLaudaspace
+LIBNAME = aud_sdl
 DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk

diff --git a/intern/audaspace/ffmpeg/Makefile b/intern/audaspace/ffmpeg/Makefile
index 2938c36146e21f04d09b29d86e0939a2640e0ebf..0bfe6494559ecd742ff12df322eac9ab63e97fcb 100644 (file)
--- a/intern/audaspace/ffmpeg/Makefile
+++ b/intern/audaspace/ffmpeg/Makefile
@@ -28,7 +28,7 @@
 #
 #
 
-LIBNAME = ffmpegaudaspace
+LIBNAME = aud_ffmpeg
 DIR = $(OCGDIR)/intern/$(LIBNAME)
 
 include nan_compile.mk

diff --git a/intern/audaspace/jack/Makefile b/intern/audaspace/jack/Makefile
new file mode 100644 (file)
index 0000000..a6cc911
--- /dev/null
+++ b/intern/audaspace/jack/Makefile
@@ -0,0 +1,40 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): GSR
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = aud_jack
+DIR = $(OCGDIR)/intern/audaspace
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += -I../intern
+CPPFLAGS += -I..
+CPPFLAGS += -I.