[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34907] branches/soc-2010-nicks: synched with trunk at revision 34793
Nick Samarin
nicks1987 at bigmir.net
Wed Feb 16 17:55:19 CET 2011
Revision: 34907
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34907
Author: nicks
Date: 2011-02-16 16:55:16 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
synched with trunk at revision 34793
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34793
Modified Paths:
--------------
branches/soc-2010-nicks/intern/CMakeLists.txt
branches/soc-2010-nicks/intern/audaspace/CMakeLists.txt
branches/soc-2010-nicks/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2010-nicks/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2010-nicks/intern/audaspace/SConscript
branches/soc-2010-nicks/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2010-nicks/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2010-nicks/intern/audaspace/intern/AUD_C-API.h
branches/soc-2010-nicks/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/soc-2010-nicks/intern/audaspace/intern/AUD_PyInit.h
branches/soc-2010-nicks/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2010-nicks/intern/audaspace/jack/AUD_JackDevice.cpp
branches/soc-2010-nicks/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2010-nicks/intern/boolop/CMakeLists.txt
branches/soc-2010-nicks/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2010-nicks/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2010-nicks/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2010-nicks/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2010-nicks/intern/bsp/CMakeLists.txt
branches/soc-2010-nicks/intern/container/CMakeLists.txt
branches/soc-2010-nicks/intern/decimation/CMakeLists.txt
branches/soc-2010-nicks/intern/elbeem/CMakeLists.txt
branches/soc-2010-nicks/intern/elbeem/intern/solver_init.cpp
branches/soc-2010-nicks/intern/elbeem/intern/utilities.h
branches/soc-2010-nicks/intern/ghost/CMakeLists.txt
branches/soc-2010-nicks/intern/ghost/GHOST_C-api.h
branches/soc-2010-nicks/intern/ghost/GHOST_IEvent.h
branches/soc-2010-nicks/intern/ghost/GHOST_IEventConsumer.h
branches/soc-2010-nicks/intern/ghost/GHOST_ISystem.h
branches/soc-2010-nicks/intern/ghost/GHOST_ITimerTask.h
branches/soc-2010-nicks/intern/ghost/GHOST_IWindow.h
branches/soc-2010-nicks/intern/ghost/GHOST_Path-api.h
branches/soc-2010-nicks/intern/ghost/GHOST_Rect.h
branches/soc-2010-nicks/intern/ghost/GHOST_Types.h
branches/soc-2010-nicks/intern/ghost/SConscript
branches/soc-2010-nicks/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_Debug.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_ModifierKeys.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_System.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowManager.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-nicks/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2010-nicks/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-nicks/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-nicks/intern/guardedalloc/SConscript
branches/soc-2010-nicks/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2010-nicks/intern/guardedalloc/intern/mallocn.c
branches/soc-2010-nicks/intern/guardedalloc/intern/mmap_win.c
branches/soc-2010-nicks/intern/iksolver/CMakeLists.txt
branches/soc-2010-nicks/intern/iksolver/intern/IK_QSegment.h
branches/soc-2010-nicks/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2010-nicks/intern/itasc/CMakeLists.txt
branches/soc-2010-nicks/intern/memutil/CMakeLists.txt
branches/soc-2010-nicks/intern/memutil/MEM_Allocator.h
branches/soc-2010-nicks/intern/memutil/MEM_CacheLimiter.h
branches/soc-2010-nicks/intern/memutil/MEM_CacheLimiterC-Api.h
branches/soc-2010-nicks/intern/memutil/MEM_RefCounted.h
branches/soc-2010-nicks/intern/memutil/MEM_RefCountedC-Api.h
branches/soc-2010-nicks/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2010-nicks/intern/moto/CMakeLists.txt
branches/soc-2010-nicks/intern/moto/include/MT_assert.h
branches/soc-2010-nicks/intern/opennl/CMakeLists.txt
branches/soc-2010-nicks/intern/opennl/extern/ONL_opennl.h
branches/soc-2010-nicks/intern/opennl/superlu/smemory.c
branches/soc-2010-nicks/intern/opennl/superlu/ssp_defs.h
branches/soc-2010-nicks/intern/opennl/superlu/util.h
branches/soc-2010-nicks/intern/smoke/CMakeLists.txt
branches/soc-2010-nicks/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2010-nicks/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2010-nicks/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2010-nicks/intern/string/CMakeLists.txt
branches/soc-2010-nicks/intern/string/SConscript
branches/soc-2010-nicks/intern/tools/pydna.py
Added Paths:
-----------
branches/soc-2010-nicks/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2010-nicks/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/soc-2010-nicks/intern/tools/bpy_introspect_ui.py
branches/soc-2010-nicks/intern/tools/dump_rna2xml.py
Removed Paths:
-------------
branches/soc-2010-nicks/intern/Makefile
branches/soc-2010-nicks/intern/audaspace/FX/Makefile
branches/soc-2010-nicks/intern/audaspace/Makefile
branches/soc-2010-nicks/intern/audaspace/OpenAL/Makefile
branches/soc-2010-nicks/intern/audaspace/Python/Makefile
branches/soc-2010-nicks/intern/audaspace/SDL/Makefile
branches/soc-2010-nicks/intern/audaspace/SRC/Makefile
branches/soc-2010-nicks/intern/audaspace/ffmpeg/Makefile
branches/soc-2010-nicks/intern/audaspace/fftw/Makefile
branches/soc-2010-nicks/intern/audaspace/intern/Makefile
branches/soc-2010-nicks/intern/audaspace/jack/Makefile
branches/soc-2010-nicks/intern/audaspace/make/
branches/soc-2010-nicks/intern/audaspace/sndfile/Makefile
branches/soc-2010-nicks/intern/boolop/Makefile
branches/soc-2010-nicks/intern/boolop/intern/Makefile
branches/soc-2010-nicks/intern/boolop/make/
branches/soc-2010-nicks/intern/bsp/Makefile
branches/soc-2010-nicks/intern/bsp/intern/Makefile
branches/soc-2010-nicks/intern/bsp/make/
branches/soc-2010-nicks/intern/bsp/test/BSP_GhostTest/Makefile
branches/soc-2010-nicks/intern/bsp/test/Makefile
branches/soc-2010-nicks/intern/container/Makefile
branches/soc-2010-nicks/intern/container/intern/Makefile
branches/soc-2010-nicks/intern/container/make/
branches/soc-2010-nicks/intern/decimation/Makefile
branches/soc-2010-nicks/intern/decimation/intern/Makefile
branches/soc-2010-nicks/intern/decimation/make/
branches/soc-2010-nicks/intern/decimation/test/Makefile
branches/soc-2010-nicks/intern/decimation/test/decimate_glut_test/Makefile
branches/soc-2010-nicks/intern/decimation/test/decimate_glut_test/intern/Makefile
branches/soc-2010-nicks/intern/decimation/test/decimate_glut_test/intern/common/Makefile
branches/soc-2010-nicks/intern/decimation/test/decimate_glut_test/intern/ply/Makefile
branches/soc-2010-nicks/intern/decimation/test/decimate_glut_test/make/
branches/soc-2010-nicks/intern/elbeem/Makefile
branches/soc-2010-nicks/intern/elbeem/intern/Makefile
branches/soc-2010-nicks/intern/elbeem/make/
branches/soc-2010-nicks/intern/ghost/Makefile
branches/soc-2010-nicks/intern/ghost/intern/Makefile
branches/soc-2010-nicks/intern/ghost/make/
branches/soc-2010-nicks/intern/ghost/test/Makefile
branches/soc-2010-nicks/intern/ghost/test/gears/Makefile
branches/soc-2010-nicks/intern/ghost/test/make/
branches/soc-2010-nicks/intern/ghost/test/multitest/Makefile
branches/soc-2010-nicks/intern/guardedalloc/Makefile
branches/soc-2010-nicks/intern/guardedalloc/intern/Makefile
branches/soc-2010-nicks/intern/guardedalloc/make/
branches/soc-2010-nicks/intern/guardedalloc/test/Makefile
branches/soc-2010-nicks/intern/guardedalloc/test/simpletest/Makefile
branches/soc-2010-nicks/intern/iksolver/Makefile
branches/soc-2010-nicks/intern/iksolver/intern/Makefile
branches/soc-2010-nicks/intern/iksolver/make/
branches/soc-2010-nicks/intern/iksolver/test/Makefile
branches/soc-2010-nicks/intern/iksolver/test/ik_glut_test/Makefile
branches/soc-2010-nicks/intern/iksolver/test/ik_glut_test/common/Makefile
branches/soc-2010-nicks/intern/iksolver/test/ik_glut_test/intern/Makefile
branches/soc-2010-nicks/intern/iksolver/test/ik_glut_test/make/
branches/soc-2010-nicks/intern/itasc/Makefile
branches/soc-2010-nicks/intern/itasc/kdl/Makefile
branches/soc-2010-nicks/intern/itasc/kdl/utilities/Makefile
branches/soc-2010-nicks/intern/itasc/make/
branches/soc-2010-nicks/intern/make/
branches/soc-2010-nicks/intern/memutil/Makefile
branches/soc-2010-nicks/intern/memutil/intern/Makefile
branches/soc-2010-nicks/intern/memutil/make/
branches/soc-2010-nicks/intern/moto/Makefile
branches/soc-2010-nicks/intern/moto/intern/Makefile
branches/soc-2010-nicks/intern/moto/make/
branches/soc-2010-nicks/intern/opennl/Makefile
branches/soc-2010-nicks/intern/opennl/intern/Makefile
branches/soc-2010-nicks/intern/opennl/make/
branches/soc-2010-nicks/intern/opennl/superlu/Makefile
branches/soc-2010-nicks/intern/smoke/Makefile
branches/soc-2010-nicks/intern/smoke/intern/Makefile
branches/soc-2010-nicks/intern/smoke/make/
branches/soc-2010-nicks/intern/string/Makefile
branches/soc-2010-nicks/intern/string/intern/Makefile
branches/soc-2010-nicks/intern/string/make/
branches/soc-2010-nicks/po/Makefile
Modified: branches/soc-2010-nicks/intern/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicks/intern/CMakeLists.txt 2011-02-16 16:47:48 UTC (rev 34906)
+++ branches/soc-2010-nicks/intern/CMakeLists.txt 2011-02-16 16:55:16 UTC (rev 34907)
@@ -24,25 +24,30 @@
#
# ***** END GPL LICENSE BLOCK *****
-ADD_SUBDIRECTORY(audaspace)
-ADD_SUBDIRECTORY(string)
-ADD_SUBDIRECTORY(ghost)
-ADD_SUBDIRECTORY(guardedalloc)
-ADD_SUBDIRECTORY(moto)
-ADD_SUBDIRECTORY(container)
-ADD_SUBDIRECTORY(memutil)
-ADD_SUBDIRECTORY(decimation)
-ADD_SUBDIRECTORY(iksolver)
-ADD_SUBDIRECTORY(boolop)
-ADD_SUBDIRECTORY(opennl)
-ADD_SUBDIRECTORY(smoke)
+add_subdirectory(audaspace)
+add_subdirectory(string)
+add_subdirectory(ghost)
+add_subdirectory(guardedalloc)
+add_subdirectory(moto)
+add_subdirectory(memutil)
+add_subdirectory(iksolver)
+add_subdirectory(opennl)
+add_subdirectory(smoke)
-IF(WITH_FLUID)
- ADD_SUBDIRECTORY(elbeem)
-ENDIF(WITH_FLUID)
+if(WITH_MOD_FLUID)
+ add_subdirectory(elbeem)
+endif()
-IF(WITH_IK_ITASC)
- ADD_SUBDIRECTORY(itasc)
-ENDIF(WITH_IK_ITASC)
+if(WITH_MOD_DECIMATE)
+ add_subdirectory(container)
+ add_subdirectory(decimation)
+endif()
-ADD_SUBDIRECTORY(bsp)
+if(WITH_MOD_BOOLEAN)
+ add_subdirectory(boolop)
+ add_subdirectory(bsp)
+endif()
+
+if(WITH_IK_ITASC)
+ add_subdirectory(itasc)
+endif()
Deleted: branches/soc-2010-nicks/intern/Makefile
===================================================================
--- branches/soc-2010-nicks/intern/Makefile 2011-02-16 16:47:48 UTC (rev 34906)
+++ branches/soc-2010-nicks/intern/Makefile 2011-02-16 16:55:16 UTC (rev 34907)
@@ -1,47 +0,0 @@
-#
-# $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): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-# Bounces make to subdirectories. Also installs after succesful all target.
-
-SOURCEDIR = intern
-
-# include nan_subdirs.mk
-
-ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver itasc bsp opennl elbeem boolop smoke audaspace
-
-all::
- @for i in $(ALLDIRS); do \
- echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
- $(MAKE) -C $$i install || exit 1; \
- done
-clean test debug::
- @for i in $(ALLDIRS); do \
- echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
- $(MAKE) -C $$i $@ || exit 1; \
- done
-
Modified: branches/soc-2010-nicks/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicks/intern/audaspace/CMakeLists.txt 2011-02-16 16:47:48 UTC (rev 34906)
+++ branches/soc-2010-nicks/intern/audaspace/CMakeLists.txt 2011-02-16 16:55:16 UTC (rev 34907)
@@ -20,7 +20,7 @@
#
# ***** END LGPL LICENSE BLOCK *****
-SET(INC
+set(INC
.
intern
FX SRC
@@ -28,56 +28,228 @@
${LIBSAMPLERATE_INC}
)
-FILE(GLOB SRC
- intern/*.cpp
- intern/*.h
- FX/*.cpp
- SRC/*.cpp
+set(SRC
+ FX/AUD_AccumulatorFactory.cpp
+ FX/AUD_BaseIIRFilterReader.cpp
+ FX/AUD_ButterworthFactory.cpp
+ FX/AUD_CallbackIIRFilterReader.cpp
+ FX/AUD_DelayFactory.cpp
+ FX/AUD_DelayReader.cpp
+ FX/AUD_DoubleFactory.cpp
+ FX/AUD_DoubleReader.cpp
+ FX/AUD_EffectFactory.cpp
+ FX/AUD_EffectReader.cpp
+ FX/AUD_EnvelopeFactory.cpp
+ FX/AUD_FaderFactory.cpp
+ FX/AUD_FaderReader.cpp
+ FX/AUD_HighpassFactory.cpp
+ FX/AUD_IIRFilterFactory.cpp
+ FX/AUD_IIRFilterReader.cpp
+ FX/AUD_LimiterFactory.cpp
+ FX/AUD_LimiterReader.cpp
+ FX/AUD_LoopFactory.cpp
+ FX/AUD_LoopReader.cpp
+ FX/AUD_LowpassFactory.cpp
+ FX/AUD_PingPongFactory.cpp
+ FX/AUD_PitchFactory.cpp
+ FX/AUD_PitchReader.cpp
+ FX/AUD_RectifyFactory.cpp
+ FX/AUD_ReverseFactory.cpp
+ FX/AUD_ReverseReader.cpp
+ FX/AUD_SquareFactory.cpp
+ FX/AUD_SumFactory.cpp
+ FX/AUD_SuperposeFactory.cpp
+ FX/AUD_SuperposeReader.cpp
+ FX/AUD_VolumeFactory.cpp
+ intern/AUD_3DMath.h
+ intern/AUD_Buffer.cpp
+ intern/AUD_Buffer.h
+ intern/AUD_BufferReader.cpp
+ intern/AUD_BufferReader.h
+ intern/AUD_C-API.cpp
+ intern/AUD_C-API.h
+ intern/AUD_ChannelMapperFactory.cpp
+ intern/AUD_ChannelMapperFactory.h
+ intern/AUD_ChannelMapperReader.cpp
+ intern/AUD_ChannelMapperReader.h
+ intern/AUD_ConverterFactory.cpp
+ intern/AUD_ConverterFactory.h
+ intern/AUD_ConverterFunctions.cpp
+ intern/AUD_ConverterFunctions.h
+ intern/AUD_ConverterReader.cpp
+ intern/AUD_ConverterReader.h
+ intern/AUD_DefaultMixer.cpp
+ intern/AUD_DefaultMixer.h
+ intern/AUD_FileFactory.cpp
+ intern/AUD_FileFactory.h
+ intern/AUD_I3DDevice.h
+ intern/AUD_IDevice.h
+ intern/AUD_IFactory.h
+ intern/AUD_IReader.h
+ intern/AUD_LinearResampleFactory.cpp
+ intern/AUD_LinearResampleFactory.h
+ intern/AUD_LinearResampleReader.cpp
+ intern/AUD_LinearResampleReader.h
+ intern/AUD_Mixer.cpp
+ intern/AUD_Mixer.h
+ intern/AUD_MixerFactory.cpp
+ intern/AUD_MixerFactory.h
+ intern/AUD_NULLDevice.cpp
+ intern/AUD_NULLDevice.h
+ intern/AUD_PyInit.h
+ intern/AUD_ReadDevice.cpp
+ intern/AUD_ReadDevice.h
+ intern/AUD_Reference.h
+ intern/AUD_ResampleFactory.h
+ intern/AUD_SequencerFactory.cpp
+ intern/AUD_SequencerFactory.h
+ intern/AUD_SequencerReader.cpp
+ intern/AUD_SequencerReader.h
+ intern/AUD_SilenceFactory.cpp
+ intern/AUD_SilenceFactory.h
+ intern/AUD_SilenceReader.cpp
+ intern/AUD_SilenceReader.h
+ intern/AUD_SinusFactory.cpp
+ intern/AUD_SinusFactory.h
+ intern/AUD_SinusReader.cpp
+ intern/AUD_SinusReader.h
+ intern/AUD_SoftwareDevice.cpp
+ intern/AUD_SoftwareDevice.h
+ intern/AUD_Space.h
+ intern/AUD_StreamBufferFactory.cpp
+ intern/AUD_StreamBufferFactory.h
+
+ FX/AUD_AccumulatorFactory.h
+ FX/AUD_BaseIIRFilterReader.h
+ FX/AUD_ButterworthFactory.h
+ FX/AUD_CallbackIIRFilterReader.h
+ FX/AUD_DelayFactory.h
+ FX/AUD_DelayReader.h
+ FX/AUD_DoubleFactory.h
+ FX/AUD_DoubleReader.h
+ FX/AUD_EffectFactory.h
+ FX/AUD_EffectReader.h
+ FX/AUD_EnvelopeFactory.h
+ FX/AUD_FaderFactory.h
+ FX/AUD_FaderReader.h
+ FX/AUD_HighpassFactory.h
+ FX/AUD_IIRFilterFactory.h
+ FX/AUD_IIRFilterReader.h
+ FX/AUD_LimiterFactory.h
+ FX/AUD_LimiterReader.h
+ FX/AUD_LoopFactory.h
+ FX/AUD_LoopReader.h
+ FX/AUD_LowpassFactory.h
+ FX/AUD_PingPongFactory.h
+ FX/AUD_PitchFactory.h
+ FX/AUD_PitchReader.h
+ FX/AUD_RectifyFactory.h
+ FX/AUD_ReverseFactory.h
+ FX/AUD_ReverseReader.h
+ FX/AUD_SquareFactory.h
+ FX/AUD_SumFactory.h
+ FX/AUD_SuperposeFactory.h
+ FX/AUD_SuperposeReader.h
+ FX/AUD_VolumeFactory.h
)
-IF(WITH_FFMPEG)
- LIST(APPEND INC ffmpeg ${FFMPEG_INC})
- FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
+if(WITH_CODEC_FFMPEG)
+ add_definitions(-DWITH_FFMPEG)
+ list(APPEND INC ffmpeg ${FFMPEG_INC})
+ set(FFMPEGSRC
+ ffmpeg/AUD_FFMPEGFactory.cpp
+ ffmpeg/AUD_FFMPEGReader.cpp
-IF(WITH_SDL)
- LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
- FILE(GLOB SDLSRC SDL/*.cpp)
- ADD_DEFINITIONS(-DWITH_SDL)
-ENDIF(WITH_SDL)
+ ffmpeg/AUD_FFMPEGFactory.h
+ ffmpeg/AUD_FFMPEGReader.h
+ )
+endif()
-IF(WITH_OPENAL)
- LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
- FILE(GLOB OPENALSRC OpenAL/*.cpp)
- ADD_DEFINITIONS(-DWITH_OPENAL)
-ENDIF(WITH_OPENAL)
+if(WITH_SDL)
+ add_definitions(-DWITH_SDL)
+ list(APPEND INC SDL ${SDL_INCLUDE_DIR})
+ set(SDLSRC
+ SDL/AUD_SDLDevice.cpp
-IF(WITH_JACK)
- LIST(APPEND INC jack ${JACK_INC})
- FILE(GLOB JACKSRC jack/*.cpp)
- ADD_DEFINITIONS(-DWITH_JACK)
-ENDIF(WITH_JACK)
+ SDL/AUD_SDLDevice.h
+ )
+endif()
-IF(WITH_SNDFILE)
- LIST(APPEND INC sndfile ${SNDFILE_INC})
- FILE(GLOB SNDFILESRC sndfile/*.cpp)
- ADD_DEFINITIONS(-DWITH_SNDFILE)
-ENDIF(WITH_SNDFILE)
+if(WITH_OPENAL)
+ add_definitions(-DWITH_OPENAL)
+ list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
+ set(OPENALSRC
+ OpenAL/AUD_OpenALDevice.cpp
-#IF(WITH_FFTW3)
-# LIST(APPEND INC fftw ${FFTW3_INC})
-# FILE(GLOB FFTW3SRC fftw/*.cpp)
-# ADD_DEFINITIONS(-DWITH_FFTW3)
-#ENDIF(WITH_FFTW3)
+ OpenAL/AUD_OpenALDevice.h
+ )
+endif()
-IF(WITH_PYTHON)
- LIST(APPEND INC Python ${PYTHON_INC})
- FILE(GLOB PYTHONSRC Python/*.cpp)
-ELSE(WITH_PYTHON)
- ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+if(WITH_JACK)
+ add_definitions(-DWITH_JACK)
+ list(APPEND INC jack ${JACK_INC})
+ set(JACKSRC
+ jack/AUD_JackDevice.cpp
-SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
+ jack/AUD_JackDevice.h
+ )
+endif()
-BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")
+if(WITH_CODEC_SNDFILE)
+ add_definitions(-DWITH_SNDFILE)
+ list(APPEND INC sndfile ${SNDFILE_INC})
+ set(SNDFILESRC
+ sndfile/AUD_SndFileFactory.cpp
+ sndfile/AUD_SndFileReader.cpp
+
+ sndfile/AUD_SndFileFactory.h
+ sndfile/AUD_SndFileReader.h
+ )
+endif()
+
+if(WITH_SAMPLERATE)
+ add_definitions(-DWITH_SAMPLERATE)
+ set(SRCFILESRC
+ SRC/AUD_SRCResampleFactory.cpp
+ SRC/AUD_SRCResampleReader.cpp
+
+ SRC/AUD_SRCResampleFactory.h
+ SRC/AUD_SRCResampleReader.h
+ )
+endif()
+
+if(WITH_FFTW3 AND FALSE)
+ add_definitions(-DWITH_FFTW3)
+ list(APPEND INC fftw ${FFTW3_INC})
+ set(FFTW3SRC
+ fftw/AUD_BandPassFactory.cpp
+ fftw/AUD_BandPassReader.cpp
+
+ fftw/AUD_BandPassFactory.h
+ fftw/AUD_BandPassReader.h
+ )
+endif()
+
+if(WITH_PYTHON)
+ list(APPEND INC Python ${PYTHON_INCLUDE_DIRS})
+ set(PYTHONSRC
+ Python/AUD_PyAPI.cpp
+
+ Python/AUD_PyAPI.h
+ )
+ add_definitions(-DWITH_PYTHON)
+endif()
+
+set(SRC
+ ${SRC}
+ ${FFMPEGSRC}
+ ${SNDFILESRC}
+ ${SRCFILESRC}
+ ${FFTW3SRC}
+ ${SDLSRC}
+ ${OPENALSRC}
+ ${JACKSRC}
+ ${PYTHONSRC}
+)
+
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}")
Deleted: branches/soc-2010-nicks/intern/audaspace/FX/Makefile
===================================================================
--- branches/soc-2010-nicks/intern/audaspace/FX/Makefile 2011-02-16 16:47:48 UTC (rev 34906)
+++ branches/soc-2010-nicks/intern/audaspace/FX/Makefile 2011-02-16 16:55:16 UTC (rev 34907)
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list