[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14272] branches/soc-2007-hcube: Start of Makefile support for hcube branch....
Kent Mein
mein at cs.umn.edu
Fri Mar 28 20:16:56 CET 2008
Revision: 14272
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14272
Author: sirdude
Date: 2008-03-28 20:16:56 +0100 (Fri, 28 Mar 2008)
Log Message:
-----------
Start of Makefile support for hcube branch....
This isn't finished but its a start. I'm going on vacation for
the weekend so I figured I'd commit incase cwant or some other
person wants to play with it.
Linking still needs to be done and cleaning up nan_definitions.mk
Note Gameengine is still using old soundsystem so I think this
branch still needs work before we merge it into main trunk...
Kent
Modified Paths:
--------------
branches/soc-2007-hcube/extern/Makefile
branches/soc-2007-hcube/intern/Makefile
branches/soc-2007-hcube/source/blender/blenkernel/intern/Makefile
branches/soc-2007-hcube/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2007-hcube/extern/tinySND/Makefile
branches/soc-2007-hcube/intern/soundsystem/Makefile
Modified: branches/soc-2007-hcube/extern/Makefile
===================================================================
--- branches/soc-2007-hcube/extern/Makefile 2008-03-28 17:03:34 UTC (rev 14271)
+++ branches/soc-2007-hcube/extern/Makefile 2008-03-28 19:16:56 UTC (rev 14272)
@@ -33,7 +33,7 @@
SOURCEDIR = extern
DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid
+DIRS = qhull/src solid
ifeq ($(WITH_FREETYPE2), true)
DIRS += bFTGL/src
@@ -43,6 +43,10 @@
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
DIRS += ffmpeg
endif
+
+# This needs to come after FFMPEG if its included....
+DIRS += tinySND
+
ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
DIRS += ffmpeg
endif
Added: branches/soc-2007-hcube/extern/tinySND/Makefile
===================================================================
--- branches/soc-2007-hcube/extern/tinySND/Makefile (rev 0)
+++ branches/soc-2007-hcube/extern/tinySND/Makefile 2008-03-28 19:16:56 UTC (rev 14272)
@@ -0,0 +1,136 @@
+#
+# $Id: Makefile 6568 2006-01-28 18:33:28Z hos $
+#
+# ***** BEGIN GPL/BL DUAL 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. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License. See http://www.blender.org/BL/ for information
+# about this.
+#
+# 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): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = tinySND
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CSRCS =
+CCSRCS = core/*.cpp
+TINYSNDDIRS = core
+
+ifeq ($(WITH_FFMPEG), true)
+ CCSRCS = ffmpeg/*.cpp
+ CPPFLAGS += $(NAN_FFMPEGLIBS)
+ CPPFLAGS += -DWITH_FFMPEG
+ TINYSNDDIRS += ffmpeg
+endif
+
+ifeq ($(WITH_BF_JACK), true)
+ CCSRCS = jack/*.cpp
+ CPPFLAGS += $(BF_JACK_INC)
+ CPPFLAGS += -DWITH_JACK
+ TINYSNDDIRS += jack
+endif
+
+ifeq ($(WITH_BF_LADSPA), true)
+ CCSRCS = ladspa/*.cpp
+ CPPFLAGS += $(BF_LADSPA_INC)
+ CPPFLAGS += -DWITH_LADSPA
+ TINYSNDDIRS += ladspa
+endif
+
+ifeq ($(WITH_BF_MAD), true)
+ CCSRCS = mad/*.cpp
+ CPPFLAGS += $(BF_MAD_INC)
+ CPPFLAGS += -DWITH_MAD
+ TINYSNDDIRS += mad
+endif
+
+ifeq ($(WITH_BF_PORTAUDIO), true)
+ CCSRCS = portaudio/*.cpp
+ CPPFLAGS += $(BF_PORTAUDIO_INC)
+ CPPFLAGS += -DWITH_PORTAUDIO
+ TINYSNDDIRS += portaudio
+endif
+
+ifeq ($(WITH_BF_SAMPLERATE), true)
+ CCSRCS = samplerate/*.cpp
+ CPPFLAGS += $(BF_SAMPLERATE_INC)
+ CPPFLAGS += -DWITH_SAMPLERATE
+ TINYSNDDIRS += samplerate
+endif
+
+ifeq ($(WITH_BF_SDL), true)
+ CCSRCS = sdl/*.cpp
+ CPPFLAGS += $(NAN_SDLCFLAGS)
+ CPPFLAGS += -DWITH_SDL
+ TINYSNDDIRS += sdl
+endif
+
+ifeq ($(WITH_BF_SNDFILE), true)
+ CCSRCS = sndfile/*.cpp
+ CPPFLAGS += $(BF_SNDFILE_INC)
+ CPPFLAGS += -DWITH_SNDFILE
+ TINYSNDDIRS += sndfile
+endif
+
+ifeq ($(WITH_BF_VORBIS), true)
+ CCSRCS = vorbis/*.cpp
+ CPPFLAGS += $(BF_VORBIS_INC)
+ CPPFLAGS += -DWITH_VORBIS
+ TINYSNDDIRS += vorbis
+endif
+
+ifeq ($(WITH_BF_WAVPACK), true)
+ CCSRCS = wavepack/*.cpp
+ CPPFLAGS += $(BF_WAVPACK_INC)
+ CPPFLAGS += -DWITH_WAVPACK
+ TINYSNDDIRS += wavepack
+endif
+
+all debug:: objdirs
+
+include nan_compile.mk
+CPPFLAGS += -I./core
+
+.PHONY: objdirs
+objdirs:
+ @for i in $(TINYSNDDIRS); do \
+ [ -d $(DIR)/$(DEBUG_DIR)$$i ] || mkdir -p $(DIR)/$(DEBUG_DIR)$$i; \
+ done
+
+install: all debug
+ @[ -d $(BF_TINYSND) ] || mkdir -p $(BF_TINYSND)
+ @[ -d $(BF_TINYSND)/include ] || mkdir -p $(BF_TINYSND)/include
+ @[ -d $(BF_TINYSND)/lib ] || mkdir -p $(BF_TINYSND)/lib
+ @[ -d $(BF_TINYSND)/lib/debug ] || mkdir -p $(BF_TINYSND)/lib/debug
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(BF_TINYSND)/lib/
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)/lib$(LIBNAME).a $(BF_TINYSND)/lib/debug/
+ifeq ($(OS),darwin)
+ ranlib $(BF_TINYSND)/lib/lib$(LIBNAME).a
+ ranlib $(BF_TINYSND)/lib/debug/lib$(LIBNAME).a
+endif
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh */*.h $(BF_TINYSND)/include/
+
Modified: branches/soc-2007-hcube/intern/Makefile
===================================================================
--- branches/soc-2007-hcube/intern/Makefile 2008-03-28 17:03:34 UTC (rev 14271)
+++ branches/soc-2007-hcube/intern/Makefile 2008-03-28 19:16:56 UTC (rev 14272)
@@ -35,7 +35,7 @@
# include nan_subdirs.mk
ALLDIRS = string ghost guardedalloc bmfont moto container memutil
-ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop
+ALLDIRS += decimation iksolver bsp opennl elbeem boolop soundsystem
all::
@for i in $(ALLDIRS); do \
Added: branches/soc-2007-hcube/intern/soundsystem/Makefile
===================================================================
--- branches/soc-2007-hcube/intern/soundsystem/Makefile (rev 0)
+++ branches/soc-2007-hcube/intern/soundsystem/Makefile 2008-03-28 19:16:56 UTC (rev 14272)
@@ -0,0 +1,50 @@
+#
+# $Id: Makefile 2786 2004-07-13 11:42:13Z blendix $
+#
+# ***** BEGIN GPL/BL DUAL 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. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License. See http://www.blender.org/BL/ for information
+# about this.
+#
+# 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): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+# opennl intern Makefile
+#
+
+LIBNAME = soundsystem
+DIR = $(OCGDIR)/$(LIBNAME)
+
+include nan_compile.mk
+
+CCFLAGS += $(NAN_LEVEL_2_CPP_WARNINGS)
+
+CPPFLAGS += -I../superlu -I$(BF_TINYSND)/include
+
+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 *.h $(NAN_SOUNDSYSTEM)/include
+
Modified: branches/soc-2007-hcube/source/blender/blenkernel/intern/Makefile
===================================================================
--- branches/soc-2007-hcube/source/blender/blenkernel/intern/Makefile 2008-03-28 17:03:34 UTC (rev 14271)
+++ branches/soc-2007-hcube/source/blender/blenkernel/intern/Makefile 2008-03-28 19:16:56 UTC (rev 14272)
@@ -41,6 +41,7 @@
# OpenGL and Python
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
# Reference to the types in makesdna and imbuf
Modified: branches/soc-2007-hcube/source/nan_definitions.mk
===================================================================
--- branches/soc-2007-hcube/source/nan_definitions.mk 2008-03-28 17:03:34 UTC (rev 14271)
+++ branches/soc-2007-hcube/source/nan_definitions.mk 2008-03-28 19:16:56 UTC (rev 14272)
@@ -82,8 +82,9 @@
export NAN_GUARDEDALLOC ?= $(LCGDIR)/guardedalloc
export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
export NAN_BSP ?= $(LCGDIR)/bsp
- export NAN_BOOLOP ?= $(LCGDIR)/boolop
+ export NAN_BOOLOP ?= $(LCGDIR)/boolop
export NAN_SOUNDSYSTEM ?= $(LCGDIR)/SoundSystem
+ export BF_TINYSND ?= $(LCGDIR)/tinySND
export NAN_STRING ?= $(LCGDIR)/string
export NAN_MEMUTIL ?= $(LCGDIR)/memutil
export NAN_CONTAINER ?= $(LCGDIR)/container
More information about the Bf-blender-cvs
mailing list