synched with trunk at revision 34793
authorNick Samarin <nicks1987@bigmir.net>
Wed, 16 Feb 2011 16:55:16 +0000 (16:55 +0000)
committerNick Samarin <nicks1987@bigmir.net>
Wed, 16 Feb 2011 16:55:16 +0000 (16:55 +0000)
219 files changed:
intern/CMakeLists.txt
intern/Makefile [deleted file]
intern/audaspace/CMakeLists.txt
intern/audaspace/FX/Makefile [deleted file]
intern/audaspace/Makefile [deleted file]
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
intern/audaspace/OpenAL/Makefile [deleted file]
intern/audaspace/Python/AUD_PyAPI.cpp
intern/audaspace/Python/Makefile [deleted file]
intern/audaspace/SConscript
intern/audaspace/SDL/Makefile [deleted file]
intern/audaspace/SRC/Makefile [deleted file]
intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
intern/audaspace/ffmpeg/Makefile [deleted file]
intern/audaspace/fftw/Makefile [deleted file]
intern/audaspace/intern/AUD_C-API.cpp
intern/audaspace/intern/AUD_C-API.h
intern/audaspace/intern/AUD_DefaultMixer.cpp
intern/audaspace/intern/AUD_PyInit.h
intern/audaspace/intern/AUD_SequencerReader.cpp
intern/audaspace/intern/Makefile [deleted file]
intern/audaspace/jack/AUD_JackDevice.cpp
intern/audaspace/jack/AUD_JackDevice.h
intern/audaspace/jack/Makefile [deleted file]
intern/audaspace/make/msvc_9_0/audaspace.vcproj [deleted file]
intern/audaspace/sndfile/Makefile [deleted file]
intern/boolop/CMakeLists.txt
intern/boolop/Makefile [deleted file]
intern/boolop/intern/BOP_BSPNode.cpp
intern/boolop/intern/BOP_BSPNode.h
intern/boolop/intern/BOP_Interface.cpp
intern/boolop/intern/BOP_Merge2.cpp
intern/boolop/intern/Makefile [deleted file]
intern/boolop/make/msvc_6_0/boolop.dsp [deleted file]
intern/boolop/make/msvc_7_0/boolop.vcproj [deleted file]
intern/boolop/make/msvc_9_0/boolop.vcproj [deleted file]
intern/bsp/CMakeLists.txt
intern/bsp/Makefile [deleted file]
intern/bsp/intern/Makefile [deleted file]
intern/bsp/make/msvc6_0/bsplib.dsp [deleted file]
intern/bsp/make/msvc6_0/bsplib.dsw [deleted file]
intern/bsp/make/msvc_7_0/bsplib.sln [deleted file]
intern/bsp/make/msvc_7_0/bsplib.vcproj [deleted file]
intern/bsp/make/msvc_9_0/bsplib.vcproj [deleted file]
intern/bsp/test/BSP_GhostTest/Makefile [deleted file]
intern/bsp/test/Makefile [deleted file]
intern/container/CMakeLists.txt
intern/container/Makefile [deleted file]
intern/container/intern/Makefile [deleted file]
intern/container/make/msvc_6_0/container.dsp [deleted file]
intern/container/make/msvc_6_0/container.dsw [deleted file]
intern/container/make/msvc_7_0/container.sln [deleted file]
intern/container/make/msvc_7_0/container.vcproj [deleted file]
intern/container/make/msvc_9_0/container.vcproj [deleted file]
intern/decimation/CMakeLists.txt
intern/decimation/Makefile [deleted file]
intern/decimation/intern/Makefile [deleted file]
intern/decimation/make/msvc_6_0/decimation.dsp [deleted file]
intern/decimation/make/msvc_6_0/decimation.dsw [deleted file]
intern/decimation/make/msvc_7_0/decimation.sln [deleted file]
intern/decimation/make/msvc_7_0/decimation.vcproj [deleted file]
intern/decimation/make/msvc_9_0/decimation.vcproj [deleted file]
intern/elbeem/CMakeLists.txt
intern/elbeem/Makefile [deleted file]
intern/elbeem/intern/Makefile [deleted file]
intern/elbeem/intern/solver_init.cpp
intern/elbeem/intern/utilities.h
intern/elbeem/make/msvc_6_0/elbeem.dsp [deleted file]
intern/elbeem/make/msvc_7_0/elbeem.vcproj [deleted file]
intern/elbeem/make/msvc_9_0/elbeem.vcproj [deleted file]
intern/ghost/CMakeLists.txt
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_IEvent.h
intern/ghost/GHOST_IEventConsumer.h
intern/ghost/GHOST_ISystem.h
intern/ghost/GHOST_ISystemPaths.h [new file with mode: 0644]
intern/ghost/GHOST_ITimerTask.h
intern/ghost/GHOST_IWindow.h
intern/ghost/GHOST_Path-api.h
intern/ghost/GHOST_Rect.h
intern/ghost/GHOST_Types.h
intern/ghost/Makefile [deleted file]
intern/ghost/SConscript
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_Debug.h
intern/ghost/intern/GHOST_EventPrinter.cpp
intern/ghost/intern/GHOST_ISystemPaths.cpp [new file with mode: 0644]
intern/ghost/intern/GHOST_ModifierKeys.cpp
intern/ghost/intern/GHOST_ModifierKeys.h
intern/ghost/intern/GHOST_Path-api.cpp
intern/ghost/intern/GHOST_System.h
intern/ghost/intern/GHOST_SystemCarbon.cpp
intern/ghost/intern/GHOST_SystemCarbon.h
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemPaths.h [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsCarbon.cpp [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsCarbon.h [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsCocoa.h [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsCocoa.mm [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsWin32.cpp [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsWin32.h [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsX11.cpp [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemPathsX11.h [new file with mode: 0644]
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemWin32.h
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
intern/ghost/intern/GHOST_TaskbarWin32.h [new file with mode: 0644]
intern/ghost/intern/GHOST_WindowCocoa.mm
intern/ghost/intern/GHOST_WindowManager.h
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowWin32.h
intern/ghost/intern/GHOST_WindowX11.cpp
intern/ghost/intern/Makefile [deleted file]
intern/ghost/make/msvc/ghost.dsp [deleted file]
intern/ghost/make/msvc/ghost.dsw [deleted file]
intern/ghost/make/msvc_7_0/ghost.sln [deleted file]
intern/ghost/make/msvc_7_0/ghost.vcproj [deleted file]
intern/ghost/make/msvc_9_0/ghost.vcproj [deleted file]
intern/ghost/test/Makefile [deleted file]
intern/ghost/test/gears/Makefile [deleted file]
intern/ghost/test/make/msvc_6_0/gears.dsp [deleted file]
intern/ghost/test/make/msvc_6_0/gears_C.dsp [deleted file]
intern/ghost/test/make/msvc_6_0/ghost_test.dsw [deleted file]
intern/ghost/test/multitest/EventToBuf.c
intern/ghost/test/multitest/Makefile [deleted file]
intern/guardedalloc/CMakeLists.txt
intern/guardedalloc/MEM_guardedalloc.h
intern/guardedalloc/Makefile [deleted file]
intern/guardedalloc/SConscript
intern/guardedalloc/cpp/mallocn.cpp
intern/guardedalloc/intern/Makefile [deleted file]
intern/guardedalloc/intern/mallocn.c
intern/guardedalloc/intern/mmap_win.c
intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp [deleted file]
intern/guardedalloc/make/msvc_7_0/guardedalloc.sln [deleted file]
intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj [deleted file]
intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj [deleted file]
intern/guardedalloc/test/Makefile [deleted file]
intern/guardedalloc/test/simpletest/Makefile [deleted file]
intern/iksolver/CMakeLists.txt
intern/iksolver/Makefile [deleted file]
intern/iksolver/intern/IK_QSegment.h
intern/iksolver/intern/IK_Solver.cpp
intern/iksolver/intern/Makefile [deleted file]
intern/iksolver/make/msvc_6_0/iksolver.dsp [deleted file]
intern/iksolver/make/msvc_6_0/iksolver.dsw [deleted file]
intern/iksolver/make/msvc_7_0/iksolver.sln [deleted file]
intern/iksolver/make/msvc_7_0/iksolver.vcproj [deleted file]
intern/iksolver/make/msvc_9_0/iksolver.vcproj [deleted file]
intern/iksolver/test/Makefile [deleted file]
intern/iksolver/test/ik_glut_test/Makefile [deleted file]
intern/iksolver/test/ik_glut_test/common/Makefile [deleted file]
intern/iksolver/test/ik_glut_test/intern/Makefile [deleted file]
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp [deleted file]
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw [deleted file]
intern/itasc/CMakeLists.txt
intern/itasc/Makefile [deleted file]
intern/itasc/kdl/Makefile [deleted file]
intern/itasc/kdl/utilities/Makefile [deleted file]
intern/itasc/make/msvc_9_0/itasc.vcproj [deleted file]
intern/make/msvc_6_0/build_install_all.dsp [deleted file]
intern/make/msvc_6_0/intern.dsw [deleted file]
intern/make/msvc_7_0/build_install_all.vcproj [deleted file]
intern/make/msvc_7_0/intern.sln [deleted file]
intern/make/msvc_9_0/INT_build_install_all.vcproj [deleted file]
intern/memutil/CMakeLists.txt
intern/memutil/MEM_Allocator.h
intern/memutil/MEM_CacheLimiter.h
intern/memutil/MEM_CacheLimiterC-Api.h
intern/memutil/MEM_RefCounted.h
intern/memutil/MEM_RefCountedC-Api.h
intern/memutil/Makefile [deleted file]
intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
intern/memutil/intern/Makefile [deleted file]
intern/memutil/make/msvc_60/memutil.dsp [deleted file]
intern/memutil/make/msvc_60/memutil.dsw [deleted file]
intern/memutil/make/msvc_7_0/memutil.sln [deleted file]
intern/memutil/make/msvc_7_0/memutil.vcproj [deleted file]
intern/memutil/make/msvc_9_0/memutil.vcproj [deleted file]
intern/moto/CMakeLists.txt
intern/moto/Makefile [deleted file]
intern/moto/include/MT_assert.h
intern/moto/intern/Makefile [deleted file]
intern/moto/make/msvc_6_0/MoTo.dsp [deleted file]
intern/moto/make/msvc_6_0/MoTo.dsw [deleted file]
intern/moto/make/msvc_7_0/moto.sln [deleted file]
intern/moto/make/msvc_7_0/moto.vcproj [deleted file]
intern/moto/make/msvc_9_0/moto.vcproj [deleted file]
intern/opennl/CMakeLists.txt
intern/opennl/Makefile [deleted file]
intern/opennl/extern/ONL_opennl.h
intern/opennl/intern/Makefile [deleted file]
intern/opennl/make/msvc_6_0/OpenNL.dsp [deleted file]
intern/opennl/make/msvc_6_0/OpenNL.dsw [deleted file]
intern/opennl/make/msvc_7_0/opennl.vcproj [deleted file]
intern/opennl/make/msvc_9_0/opennl.vcproj [deleted file]
intern/opennl/superlu/Makefile [deleted file]
intern/opennl/superlu/smemory.c
intern/opennl/superlu/ssp_defs.h
intern/opennl/superlu/util.h
intern/smoke/CMakeLists.txt
intern/smoke/Makefile [deleted file]
intern/smoke/intern/FLUID_3D.cpp
intern/smoke/intern/Makefile [deleted file]
intern/smoke/intern/WAVELET_NOISE.h
intern/smoke/intern/WTURBULENCE.cpp
intern/smoke/make/msvc_9_0/smoke.vcproj [deleted file]
intern/string/CMakeLists.txt
intern/string/Makefile [deleted file]
intern/string/SConscript
intern/string/intern/Makefile [deleted file]
intern/string/make/msvc_6_0/string.dsp [deleted file]
intern/string/make/msvc_6_0/string.dsw [deleted file]
intern/string/make/msvc_7_0/string.sln [deleted file]
intern/string/make/msvc_7_0/string.vcproj [deleted file]
intern/string/make/msvc_9_0/string.vcproj [deleted file]
po/Makefile [deleted file]

index acc13fb..3eed1ef 100644 (file)
 #
 # ***** 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()
diff --git a/intern/Makefile b/intern/Makefile
deleted file mode 100644 (file)
index ed0b0cf..0000000
+++ /dev/null
@@ -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
-
index 6982bd8..74f483e 100644 (file)
@@ -20,7 +20,7 @@
 #
 # ***** END LGPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
        .
        intern
        FX SRC
@@ -28,56 +28,228 @@ SET(INC
        ${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_CODEC_FFMPEG)
+       add_definitions(-DWITH_FFMPEG)
+       list(APPEND INC ffmpeg ${FFMPEG_INC})
+       set(FFMPEGSRC
+               ffmpeg/AUD_FFMPEGFactory.cpp
+               ffmpeg/AUD_FFMPEGReader.cpp
+
+               ffmpeg/AUD_FFMPEGFactory.h
+               ffmpeg/AUD_FFMPEGReader.h
+       )
+endif()
+
+if(WITH_SDL)
+       add_definitions(-DWITH_SDL)
+       list(APPEND INC SDL ${SDL_INCLUDE_DIR})
+       set(SDLSRC
+               SDL/AUD_SDLDevice.cpp
+
+               SDL/AUD_SDLDevice.h
+       )
+endif()
+
+if(WITH_OPENAL)
+       add_definitions(-DWITH_OPENAL)
+       list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
+       set(OPENALSRC
+               OpenAL/AUD_OpenALDevice.cpp
+
+               OpenAL/AUD_OpenALDevice.h
+       )       
+endif()
+
+if(WITH_JACK)
+       add_definitions(-DWITH_JACK)
+       list(APPEND INC jack ${JACK_INC})
+       set(JACKSRC
+               jack/AUD_JackDevice.cpp
+
+               jack/AUD_JackDevice.h
+       )       
+endif()
+
+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}
 )
 
-IF(WITH_FFMPEG)
-       LIST(APPEND INC ffmpeg ${FFMPEG_INC})
-       FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_SDL)
-       LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
-       FILE(GLOB SDLSRC SDL/*.cpp)
-       ADD_DEFINITIONS(-DWITH_SDL)
-ENDIF(WITH_SDL)
-
-IF(WITH_OPENAL)
-       LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
-       FILE(GLOB OPENALSRC OpenAL/*.cpp)
-       ADD_DEFINITIONS(-DWITH_OPENAL)
-ENDIF(WITH_OPENAL)
-
-IF(WITH_JACK)
-       LIST(APPEND INC jack ${JACK_INC})
-       FILE(GLOB JACKSRC jack/*.cpp)
-       ADD_DEFINITIONS(-DWITH_JACK)
-ENDIF(WITH_JACK)
-
-IF(WITH_SNDFILE)
-       LIST(APPEND INC sndfile ${SNDFILE_INC})
-       FILE(GLOB SNDFILESRC sndfile/*.cpp)
-       ADD_DEFINITIONS(-DWITH_SNDFILE)
-ENDIF(WITH_SNDFILE)
-
-#IF(WITH_FFTW3)
-#      LIST(APPEND INC fftw ${FFTW3_INC})
-#      FILE(GLOB FFTW3SRC fftw/*.cpp)
-#      ADD_DEFINITIONS(-DWITH_FFTW3)
-#ENDIF(WITH_FFTW3)
-
-IF(WITH_PYTHON)
-       LIST(APPEND INC Python ${PYTHON_INC})
-       FILE(GLOB PYTHONSRC Python/*.cpp)
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
-
-BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}")
diff --git a/intern/audaspace/FX/Makefile b/intern/audaspace/FX/Makefile
deleted file mode 100644 (file)
index bda0e2b..0000000
+++ /dev/null
@@ -1,43 +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 *****
-#
-#
-
-LIBNAME = aud_fx
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I../ffmpeg
-CPPFLAGS += -I../intern
-CPPFLAGS += -I../SDL
-CPPFLAGS += -I../SRC
-CPPFLAGS += -I..
-CPPFLAGS += -I.
diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile
deleted file mode 100644 (file)
index c1a613a..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-#
-# $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 *****
-#
-#
-
-include nan_definitions.mk
-
-LIBNAME = audaspace
-SOURCEDIR = intern/audaspace
-DIR = $(OCGDIR)/$(SOURCEDIR)
-DIRS = intern
-DIRS += FX
-DIRS += SDL
-DIRS += SRC
-DIRS += Python
-
-ifeq ($(WITH_FFMPEG),true)
-  DIRS += ffmpeg
-endif
-
-ifeq ($(WITH_OPENAL),true)
-  DIRS += OpenAL
-endif
-
-ifeq ($(WITH_JACK),true)
-  DIRS += jack
-endif
-
-ifeq ($(WITH_SNDFILE),true)
-  DIRS += sndfile
-endif
-
-#ifeq ($(WITH_FFTW3),true)
-#  DIRS += fftw
-#endif
-
-include nan_subdirs.mk
-
-install: $(ALL_OR_DEBUG)
-       @[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE)
-       @[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include
-       @[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_python.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-
-ifeq ($(WITH_FFMPEG),true)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_ffmpeg.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-endif
-
-ifeq ($(WITH_OPENAL),true)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_openal.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-endif
-
-ifeq ($(WITH_JACK),true)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_jack.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-endif
-
-ifeq ($(WITH_SNDFILE),true)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-endif
-
-#ifeq ($(WITH_FFTW3),true)
-#      @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
-#endif
-
-ifeq ($(OS),darwin)
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a
-
-ifeq ($(WITH_FFMPEG),true)
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a
-endif
-
-ifeq ($(WITH_OPENAL),true)
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a
-endif
-
-ifeq ($(WITH_JACK),true)
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a
-endif
-
-ifeq ($(WITH_SNDFILE),true)
-       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
-endif
-
-#ifeq ($(WITH_FFTW3),true)
-#      ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
-#endif
-
-endif
-       @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/
index a87a4ad..6a9f2c4 100644 (file)
@@ -128,16 +128,21 @@ void AUD_OpenALDevice::updateStreams()
 
        ALint info;
        AUD_DeviceSpecs specs = m_specs;
+       ALCenum cerr;
+       std::list<AUD_OpenALHandle*> stopSounds;
+       std::list<AUD_OpenALHandle*> pauseSounds;
+       AUD_HandleIterator it;
 
        while(1)
        {
                lock();
 
                alcSuspendContext(m_context);
-
+               cerr = alcGetError(m_device);
+               if(cerr == ALC_NO_ERROR)
                {
                        // for all sounds
-                       for(AUD_HandleIterator it = m_playingSounds->begin(); it != m_playingSounds->end(); it++)
+                       for(it = m_playingSounds->begin(); it != m_playingSounds->end(); it++)
                        {
                                sound = *it;
 
@@ -232,33 +237,33 @@ void AUD_OpenALDevice::updateStreams()
                                                if(sound->stop)
                                                        sound->stop(sound->stop_data);
 
-                                               // increment the iterator to the next value,
-                                               // because the sound gets deleted in the list here.
-                                               ++it;
                                                // pause or
                                                if(sound->keep)
-                                                       pause(sound);
+                                                       pauseSounds.push_back(sound);
                                                // stop
                                                else
-                                                       stop(sound);
-                                               // decrement again, so that we get the next sound in the
-                                               // next loop run
-                                               if(m_playingSounds->empty())
-                                                       break;
-                                               else
-                                                       --it;
+                                                       stopSounds.push_back(sound);
                                        }
                                        // continue playing
                                        else
                                                alSourcePlay(sound->source);
                                }
                        }
-               }
 
-               alcProcessContext(m_context);
+                       for(it = pauseSounds.begin(); it != pauseSounds.end(); it++)
+                               pause(*it);
+
+                       for(it = stopSounds.begin(); it != stopSounds.end(); it++)
+                               stop(*it);
+
+                       pauseSounds.clear();
+                       stopSounds.clear();
+
+                       alcProcessContext(m_context);
+               }
 
                // stop thread
-               if(m_playingSounds->empty())
+               if(m_playingSounds->empty() || (cerr != ALC_NO_ERROR))
                {
                        unlock();
                        m_playing = false;
@@ -338,6 +343,7 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize)
        m_useMC = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE;
 
        alGetError();
+       alcGetError(m_device);
 
        m_specs = specs;
        m_buffersize = buffersize;
diff --git a/intern/audaspace/OpenAL/Makefile b/intern/audaspace/OpenAL/Makefile
deleted file mode 100644 (file)
index 4cf9f66..0000000
+++ /dev/null
@@ -1,39 +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 *****
-#
-#
-
-LIBNAME = aud_openal
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I../intern
-CPPFLAGS += -I.
index b0c55d5..9620f26 100644 (file)
@@ -851,7 +851,7 @@ Factory_filter(Factory* self, PyObject* args)
                return NULL;
        }
 
-       if(!PySequence_Length(py_b) || (py_a != NULL && !PySequence_Length(py_a)))
+       if(!PySequence_Size(py_b) || (py_a != NULL && !PySequence_Size(py_a)))
        {
                PyErr_SetString(PyExc_ValueError, "The sequence has to contain at least one value!");
                return NULL;
@@ -862,7 +862,7 @@ Factory_filter(Factory* self, PyObject* args)
        float value;
        int result;
 
-       for(int i = 0; i < PySequence_Length(py_b); i++)
+       for(int i = 0; i < PySequence_Size(py_b); i++)
        {
                py_value = PySequence_GetItem(py_b, i);
                result = PyArg_Parse(py_value, "f:filter", &value);
@@ -876,7 +876,7 @@ Factory_filter(Factory* self, PyObject* args)
 
        if(py_a)
        {
-               for(int i = 0; i < PySequence_Length(py_a); i++)
+               for(int i = 0; i < PySequence_Size(py_a); i++)
                {
                        py_value = PySequence_GetItem(py_a, i);
                        result = PyArg_Parse(py_value, "f:filter", &value);
@@ -1044,18 +1044,13 @@ Handle_pause(Handle *self)
 
        try
        {
-               if(device->device->pause(self->handle))
-               {
-                       Py_RETURN_TRUE;
-               }
+               return PyBool_FromLong((long)device->device->pause(self->handle));
        }
        catch(AUD_Exception& e)
        {
                PyErr_SetString(AUDError, e.str);
                return NULL;
        }
-
-       Py_RETURN_FALSE;
 }
 
 PyDoc_STRVAR(M_aud_Handle_resume_doc,
@@ -1071,18 +1066,13 @@ Handle_resume(Handle *self)
 
        try
        {
-               if(device->device->resume(self->handle))
-               {
-                       Py_RETURN_TRUE;
-               }
+               return PyBool_FromLong((long)device->device->resume(self->handle));
        }
        catch(AUD_Exception& e)
        {
                PyErr_SetString(AUDError, e.str);
                return NULL;
        }
-
-       Py_RETURN_FALSE;
 }
 
 PyDoc_STRVAR(M_aud_Handle_stop_doc,
@@ -1099,18 +1089,13 @@ Handle_stop(Handle *self)
 
        try
        {
-               if(device->device->stop(self->handle))
-               {
-                       Py_RETURN_TRUE;
-               }
+               return PyBool_FromLong((long)device->device->stop(self->handle));
        }
        catch(AUD_Exception& e)
        {
                PyErr_SetString(AUDError, e.str);
                return NULL;
        }
-
-       Py_RETURN_FALSE;
 }
 
 static PyMethodDef Handle_methods[] = {
@@ -1185,14 +1170,7 @@ Handle_get_keep(Handle *self, void* nothing)
 
        try
        {
-               if(device->device->getKeep(self->handle))
-               {
-                       Py_RETURN_TRUE;
-               }
-               else
-               {
-                       Py_RETURN_FALSE;
-               }
+               return PyBool_FromLong((long)device->device->getKeep(self->handle));
        }
        catch(AUD_Exception& e)
        {
@@ -1237,7 +1215,7 @@ Handle_get_status(Handle *self, void* nothing)
 
        try
        {
-               return Py_BuildValue("i", device->device->getStatus(self->handle));
+               return PyBool_FromLong((long)device->device->getStatus(self->handle));
        }
        catch(AUD_Exception& e)
        {
@@ -1568,14 +1546,7 @@ Handle_get_relative(Handle *self, void* nothing)
                AUD_I3DDevice* device = dynamic_cast<AUD_I3DDevice*>(dev->device);
                if(device)
                {
-                       if(device->isRelative(self->handle))
-                       {
-                               Py_RETURN_TRUE;
-                       }
-                       else
-                       {
-                               Py_RETURN_FALSE;
-                       }
+                       return PyBool_FromLong((long)device->isRelative(self->handle));
                }
                else
                {
diff --git a/intern/audaspace/Python/Makefile b/intern/audaspace/Python/Makefile
deleted file mode 100644 (file)
index a66f865..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-#
-# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2010 by Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Ton
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-#
-
-LIBNAME = aud_python
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-
-ifeq ($(WITH_SDL),true)
-       CPPFLAGS += -DWITH_SDL
-       CPPFLAGS += $(NAN_SDLCFLAGS)
-endif
-
-ifeq ($(WITH_OPENAL),true)
-       CPPFLAGS += -DWITH_OPENAL
-       CPPFLAGS += -I../OpenAL
-endif
-
-ifeq ($(WITH_JACK),true)
-       CPPFLAGS += -DWITH_JACK
-       CPPFLAGS += $(NAN_JACKCFLAGS)
-       CPPFLAGS += -I../jack
-endif
-
-ifeq ($(WITH_FFMPEG),true)
-       CPPFLAGS += -DWITH_FFMPEG
-       CPPFLAGS += $(NAN_FFMPEGCFLAGS)
-endif
-
-ifeq ($(WITH_SNDFILE),true)
-       CPPFLAGS += -DWITH_SNDFILE
-       CPPFLAGS += -I../sndfile
-       CPPFLAGS += -I$(NAN_SNDFILE)/include
-endif
-
-CPPFLAGS += -I$(NAN_SAMPLERATE)/include/
-CPPFLAGS += -I../ffmpeg
-CPPFLAGS += -I../FX
-CPPFLAGS += -I../SDL
-CPPFLAGS += -I../SRC
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
index 7230bff..ecc9498 100644 (file)
@@ -39,10 +39,12 @@ if env['WITH_BF_SNDFILE']:
 if env['WITH_BF_PYTHON']:
     sources += env.Glob('Python/*.cpp')
     incs += ' Python ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
+# not optional with scons yet
+defs.append('WITH_SAMPLERATE')
+
 env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile
deleted file mode 100644 (file)
index 02a4068..0000000
+++ /dev/null
@@ -1,41 +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 *****
-#
-#
-
-LIBNAME = aud_sdl
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += $(NAN_SDLCFLAGS)
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
diff --git a/intern/audaspace/SRC/Makefile b/intern/audaspace/SRC/Makefile
deleted file mode 100644 (file)
index 0959ebb..0000000
+++ /dev/null
@@ -1,44 +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 *****
-#
-#
-
-LIBNAME = aud_src
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I$(NAN_SAMPLERATE)/include
-CPPFLAGS += -I../ffmpeg
-CPPFLAGS += -I../FX
-CPPFLAGS += -I../SDL
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
index 623e99d..5526b0d 100644 (file)
@@ -246,13 +246,26 @@ void AUD_FFMPEGReader::seek(int position)
 {
        if(position >= 0)
        {
+               uint64_t st_time = m_formatCtx->start_time;
+               uint64_t seek_pos = position * AV_TIME_BASE / m_specs.rate;
+
+               if (seek_pos < 0) {
+                       seek_pos = 0;
+               }
+
+               if (st_time != AV_NOPTS_VALUE) {
+                       seek_pos += st_time;
+               }
+
+               double pts_time_base = 
+                       av_q2d(m_formatCtx->streams[m_stream]->time_base);
+               uint64_t pts_st_time =
+                       ((st_time != AV_NOPTS_VALUE) ? st_time : 0)
+                       / pts_time_base / (uint64_t) AV_TIME_BASE;
+
                // a value < 0 tells us that seeking failed
-               if(av_seek_frame(m_formatCtx,
-                                                -1,
-                                                (uint64_t)(((uint64_t)position *
-                                                                        (uint64_t)AV_TIME_BASE) /
-                                                                       (uint64_t)m_specs.rate),
-                                                AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
+               if(av_seek_frame(m_formatCtx, -1, seek_pos,
+                                AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
                {
                        avcodec_flush_buffers(m_codecCtx);
                        m_position = position;
@@ -273,9 +286,8 @@ void AUD_FFMPEGReader::seek(int position)
                                        if(packet.pts != AV_NOPTS_VALUE)
                                        {
                                                // calculate real position, and read to frame!
-                                               m_position = packet.pts *
-                                                       av_q2d(m_formatCtx->streams[m_stream]->time_base) *
-                                                       m_specs.rate;
+                                               m_position = (packet.pts - 
+                                                       pts_st_time) * pts_time_base * m_specs.rate;
 
                                                if(m_position < position)
                                                {
@@ -298,6 +310,7 @@ void AUD_FFMPEGReader::seek(int position)
                }
                else
                {
+                       fprintf(stderr, "seeking failed!\n");
                        // Seeking failed, do nothing.
                }
        }
diff --git a/intern/audaspace/ffmpeg/Makefile b/intern/audaspace/ffmpeg/Makefile
deleted file mode 100644 (file)
index 492ac83..0000000
+++ /dev/null
@@ -1,41 +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 *****
-#
-#
-
-LIBNAME = aud_ffmpeg
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += $(NAN_FFMPEGCFLAGS)
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
diff --git a/intern/audaspace/fftw/Makefile b/intern/audaspace/fftw/Makefile
deleted file mode 100644 (file)
index c2d069d..0000000
+++ /dev/null
@@ -1,42 +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 *****
-#
-#
-
-LIBNAME = aud_fftw
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I../intern
-CPPFLAGS += -I../FX
-CPPFLAGS += -I..
-CPPFLAGS += -I.
-CPPFLAGS += -I$(BF_FFTW3)/include
index d22d9e6..5e4e45d 100644 (file)
@@ -28,7 +28,7 @@
 #define __STDC_CONSTANT_MACROS
 #endif
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "AUD_PyInit.h"
 #include "AUD_PyAPI.h"
 
@@ -141,7 +141,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
                AUD_device = dev;
                AUD_3ddevice = dynamic_cast<AUD_I3DDevice*>(AUD_device);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                if(g_pyinitialized)
                {
                        g_device = (Device*)Device_empty();
@@ -162,7 +162,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
 
 void AUD_exit()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(g_device)
        {
                Py_XDECREF(g_device);
@@ -176,7 +176,7 @@ void AUD_exit()
        AUD_3ddevice = NULL;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 static PyObject* AUD_getCDevice(PyObject* self)
 {
        if(g_device)
@@ -197,7 +197,7 @@ PyObject* AUD_initPython()
 {
        PyObject* module = PyInit_aud();
        PyModule_AddObject(module, "device", (PyObject *)PyCFunction_New(meth_getcdevice, NULL));
-       PyDict_SetItemString(PySys_GetObject("modules"), "aud", module);
+       PyDict_SetItemString(PyImport_GetModuleDict(), "aud", module);
        if(AUD_device)
        {
                g_device = (Device*)Device_empty();
@@ -241,6 +241,7 @@ AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
                {
                        info.specs = reader->getSpecs();
                        info.length = reader->getLength() / (float) info.specs.rate;
+                       delete reader;
                }
        }
        catch(AUD_Exception&)
@@ -721,7 +722,7 @@ int AUD_setDeviceVolume(AUD_Device* device, float volume)
                return true;
        }
        catch(AUD_Exception&) {}
-       
+
        return false;
 }
 
@@ -781,10 +782,20 @@ float* AUD_readSoundBuffer(const char* filename, float low, float high,
        AUD_Sound* sound;
 
        AUD_FileFactory file(filename);
+
+       AUD_IReader* reader = file.createReader();
+       AUD_SampleRate rate = reader->getSpecs().rate;
+       delete reader;
+
        AUD_ChannelMapperFactory mapper(&file, specs);
-       AUD_LowpassFactory lowpass(&mapper, high);
-       AUD_HighpassFactory highpass(&lowpass, low);
-       AUD_EnvelopeFactory envelope(&highpass, attack, release, threshold, 0.1f);
+       sound = &mapper;
+       AUD_LowpassFactory lowpass(sound, high);
+       if(high < rate)
+               sound = &lowpass;
+       AUD_HighpassFactory highpass(sound, low);
+       if(low > 0)
+               sound = &highpass;
+       AUD_EnvelopeFactory envelope(sound, attack, release, threshold, 0.1f);
        AUD_LinearResampleFactory resampler(&envelope, specs);
        sound = &resampler;
        AUD_SquareFactory squaref(sound, sthreshold);
@@ -797,7 +808,7 @@ float* AUD_readSoundBuffer(const char* filename, float low, float high,
        else if(additive)
                sound = &sum;
 
-       AUD_IReader* reader = sound->createReader();
+       reader = sound->createReader();
 
        if(reader == NULL)
                return NULL;
index 08f2845..71b5ca8 100644 (file)
@@ -58,7 +58,7 @@ typedef struct
 /**
  * Initializes FFMPEG if it is enabled.
  */
-extern void AUD_initOnce();
+extern void AUD_initOnce(void);
 
 /**
  * Initializes an audio device.
@@ -72,17 +72,17 @@ extern int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize
 /**
  * Unitinitializes an audio device.
  */
-extern void AUD_exit();
+extern void AUD_exit(void);
 
 /**
  * Locks the playback device.
  */
-extern void AUD_lock();
+extern void AUD_lock(void);
 
 /**
  * Unlocks the device.
  */
-extern void AUD_unlock();
+extern void AUD_unlock(void);
 
 /**
  * Returns information about a sound.
@@ -471,9 +471,9 @@ extern void AUD_muteSequencer(AUD_Sound* sequencer, AUD_SequencerEntry* entry,
 
 extern int AUD_readSound(AUD_Sound* sound, sample_t* buffer, int length);
 
-extern void AUD_startPlayback();
+extern void AUD_startPlayback(void);
 
-extern void AUD_stopPlayback();
+extern void AUD_stopPlayback(void);
 
 extern void AUD_seekSequencer(AUD_Channel* handle, float time);
 
@@ -483,7 +483,7 @@ extern float AUD_getSequencerPosition(AUD_Channel* handle);
 extern void AUD_setSyncCallback(AUD_syncFunction function, void* data);
 #endif
 
-extern int AUD_doesPlayback();
+extern int AUD_doesPlayback(void);
 
 #ifdef __cplusplus
 }
index 12faa10..2b641b6 100644 (file)
@@ -24,7 +24,9 @@
  */
 
 #include "AUD_DefaultMixer.h"
+#ifdef WITH_SAMPLERATE
 #include "AUD_SRCResampleReader.h"
+#endif
 #include "AUD_ChannelMapperReader.h"
 #include "AUD_ChannelMapperFactory.h"
 
@@ -50,10 +52,12 @@ AUD_IReader* AUD_DefaultMixer::prepare(AUD_IReader* reader)
                specs.channels = m_specs.channels;
        }
 
+#ifdef WITH_SAMPLERATE
        // resample
        if(specs.rate != m_specs.rate)
                reader = new AUD_SRCResampleReader(reader, m_specs.specs);
-
+#endif
+       
        // rechannel
        if(specs.channels != m_specs.channels)
                reader = new AUD_ChannelMapperReader(reader,
index bd67259..6f18bdb 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef AUD_PYINIT
 #define AUD_PYINIT
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "Python.h"
 
 #ifdef __cplusplus
@@ -36,7 +36,7 @@ extern "C" {
 /**
  * Initalizes the Python module.
  */
-extern PyObject* AUD_initPython();
+extern PyObject* AUD_initPython(void);
 
 #ifdef __cplusplus
 }
index 6929320..5b546ca 100644 (file)
@@ -188,7 +188,16 @@ void AUD_SequencerReader::read(int & length, sample_t* & buffer)
                                        delete strip->reader;
 
                                if(strip->old_sound)
-                                       strip->reader = m_mixer->prepare(strip->old_sound->createReader());
+                               {
+                                       try
+                                       {
+                                               strip->reader = m_mixer->prepare(strip->old_sound->createReader());
+                                       }
+                                       catch(AUD_Exception)
+                                       {
+                                               strip->reader = NULL;
+                                       }
+                               }
                                else
                                        strip->reader = NULL;
                        }
diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile
deleted file mode 100644 (file)
index b89a8bc..0000000
+++ /dev/null
@@ -1,74 +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 *****
-#
-#
-
-LIBNAME = audaspace
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-
-ifeq ($(WITH_SDL),true)
-       CPPFLAGS += -DWITH_SDL
-       CPPFLAGS += $(NAN_SDLCFLAGS)
-endif
-
-ifeq ($(WITH_OPENAL),true)
-       CPPFLAGS += -DWITH_OPENAL
-       CPPFLAGS += -I../OpenAL
-endif
-
-ifeq ($(WITH_JACK),true)
-       CPPFLAGS += -DWITH_JACK
-       CPPFLAGS += $(NAN_JACKCFLAGS)
-       CPPFLAGS += -I../jack
-endif
-
-ifeq ($(WITH_FFMPEG),true)
-       CPPFLAGS += -DWITH_FFMPEG
-       CPPFLAGS += $(NAN_FFMPEGCFLAGS)
-endif
-
-ifeq ($(WITH_SNDFILE),true)
-       CPPFLAGS += -DWITH_SNDFILE
-       CPPFLAGS += -I../sndfile
-       CPPFLAGS += -I$(NAN_SNDFILE)/include
-endif
-
-CPPFLAGS += -I$(NAN_SAMPLERATE)/include/
-CPPFLAGS += -I../ffmpeg
-CPPFLAGS += -I../FX
-CPPFLAGS += -I../SDL
-CPPFLAGS += -I../SRC
-CPPFLAGS += -I../Python
-CPPFLAGS += -I..
-CPPFLAGS += -I.
index 5aa3f7b..0d72e85 100644 (file)
@@ -236,9 +236,9 @@ AUD_JackDevice::AUD_JackDevice(std::string name, AUD_DeviceSpecs specs, int buff
        create();
 
        m_valid = true;
-       m_playing = false;
        m_sync = 0;
        m_syncFunc = NULL;
+       m_nextState = m_state = jack_transport_query(m_client, NULL);
 
        pthread_mutex_init(&m_mixingLock, NULL);
        pthread_cond_init(&m_mixingCondition, NULL);
@@ -307,11 +307,13 @@ void AUD_JackDevice::playing(bool playing)
 void AUD_JackDevice::startPlayback()
 {
        jack_transport_start(m_client);
+       m_nextState = JackTransportRolling;
 }
 
 void AUD_JackDevice::stopPlayback()
 {
        jack_transport_stop(m_client);
+       m_nextState = JackTransportStopped;
 }
 
 void AUD_JackDevice::seekPlayback(float time)
@@ -335,5 +337,10 @@ float AUD_JackDevice::getPlaybackPosition()
 
 bool AUD_JackDevice::doesPlayback()
 {
-       return jack_transport_query(m_client, NULL) != JackTransportStopped;
+       jack_transport_state_t state = jack_transport_query(m_client, NULL);
+
+       if(state != m_state)
+               m_nextState = m_state = state;
+
+       return m_nextState != JackTransportStopped;
 }
index 418992e..cc3cf7d 100644 (file)
@@ -87,9 +87,14 @@ private:
        static int jack_sync(jack_transport_state_t state, jack_position_t* pos, void* data);
 
        /**
-        * Last Jack Transport playing state.
+        * Next Jack Transport state (-1 if not expected to change).
         */
-       bool m_playing;
+       jack_transport_state_t m_nextState;
+
+       /**
+        * Current jack transport status.
+        */
+       jack_transport_state_t m_state;
 
        /**
         * Syncronisation state.
diff --git a/intern/audaspace/jack/Makefile b/intern/audaspace/jack/Makefile
deleted file mode 100644 (file)
index 23cadf5..0000000
+++ /dev/null
@@ -1,44 +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): GSR
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-#
-
-LIBNAME = aud_jack
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-# If we are here, jack is enable.
-CPPFLAGS += -DWITH_JACK
-CPPFLAGS += $(NAN_JACKCFLAGS)
-
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj
deleted file mode 100644 (file)
index e6d83f1..0000000
+++ /dev/null
@@ -1,924 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="INT_audaspace"\r
-       ProjectGUID="{87032FD2-9BA0-6B43-BE33-8902BA8F9172}"\r
-       RootNamespace="audaspace"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Blender Release|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="2"\r
-                               AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\audaspace.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libaudaspace.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Blender Debug|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\debug"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\debug"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               BufferSecurityCheck="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\audaspace.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libaudaspace.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="3DPlugin Release|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="2"\r
-                               AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\audaspace.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libaudaspace.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="3DPlugin Debug|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\audaspace.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libaudaspace.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="intern"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_3DMath.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Buffer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Buffer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_BufferReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_BufferReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_C-API.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_C-API.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ChannelMapperFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ChannelMapperFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ChannelMapperReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ChannelMapperReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterFunctions.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterFunctions.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ConverterReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_DefaultMixer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_DefaultMixer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_FileFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_FileFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_I3DDevice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_IDevice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_IFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_IReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_LinearResampleFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_LinearResampleFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_LinearResampleReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_LinearResampleReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Mixer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Mixer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_MixerFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_MixerFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_NULLDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_NULLDevice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_PyInit.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ReadDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ReadDevice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Reference.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_ResampleFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SequencerFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SequencerFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SequencerReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SequencerReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SilenceFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SilenceFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SilenceReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SilenceReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SinusFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SinusFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SinusReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SinusReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SoftwareDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_SoftwareDevice.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_Space.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_StreamBufferFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\intern\AUD_StreamBufferFactory.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="ffmpeg"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\ffmpeg\AUD_FFMPEGFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\ffmpeg\AUD_FFMPEGFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\ffmpeg\AUD_FFMPEGReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\ffmpeg\AUD_FFMPEGReader.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="FX"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_AccumulatorFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_AccumulatorFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_BaseIIRFilterReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_BaseIIRFilterReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ButterworthFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ButterworthFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_CallbackIIRFilterReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_CallbackIIRFilterReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DelayFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DelayFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DelayReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DelayReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DoubleFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DoubleFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DoubleReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_DoubleReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EffectFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EffectFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EffectReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EffectReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EnvelopeFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_EnvelopeFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_FaderFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_FaderFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_FaderReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_FaderReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_HighpassFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_HighpassFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_IIRFilterFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_IIRFilterFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_IIRFilterReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_IIRFilterReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LimiterFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LimiterFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LimiterReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LimiterReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LoopFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LoopFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LoopReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LoopReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LowpassFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_LowpassFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PingPongFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PingPongFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PitchFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PitchFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PitchReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_PitchReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_RectifyFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_RectifyFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ReverseFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ReverseFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ReverseReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_ReverseReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SquareFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SquareFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SumFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SumFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SuperposeFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SuperposeFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SuperposeReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_SuperposeReader.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_VolumeFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\FX\AUD_VolumeFactory.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="OpenAL"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\OpenAL\AUD_OpenALDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\OpenAL\AUD_OpenALDevice.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="SDL"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\SDL\AUD_SDLDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\SDL\AUD_SDLDevice.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="SRC"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\SRC\AUD_SRCResampleFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\SRC\AUD_SRCResampleFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\SRC\AUD_SRCResampleReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\SRC\AUD_SRCResampleReader.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="jack"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\jack\AUD_JackDevice.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\jack\AUD_JackDevice.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="sndfile"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\sndfile\AUD_SndFileFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\sndfile\AUD_SndFileFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\sndfile\AUD_SndFileReader.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\sndfile\AUD_SndFileReader.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Python"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\Python\AUD_PyAPI.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Python\AUD_PyAPI.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/intern/audaspace/sndfile/Makefile b/intern/audaspace/sndfile/Makefile
deleted file mode 100644 (file)
index 0012a11..0000000
+++ /dev/null
@@ -1,41 +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):
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-#
-
-LIBNAME = aud_sndfile
-DIR = $(OCGDIR)/intern/audaspace
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-
-CPPFLAGS += -I$(NAN_SNDFILE)/include
-CPPFLAGS += -I../intern
-CPPFLAGS += -I..
-CPPFLAGS += -I.
index 9150071..7e36f25 100644 (file)
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC        
+set(INC        
        .
        ./intern
        ./extern
@@ -36,6 +36,43 @@ SET(INC
        ../../source/blender/makesdna
 )
 
-FILE(GLOB SRC intern/*.cpp)
+set(SRC
+       intern/BOP_BBox.cpp
+       intern/BOP_BSPNode.cpp
+       intern/BOP_BSPTree.cpp
+       intern/BOP_Edge.cpp
+       intern/BOP_Face.cpp
+       intern/BOP_Face2Face.cpp
+       intern/BOP_Interface.cpp
+       intern/BOP_MathUtils.cpp
+       intern/BOP_Merge.cpp
+       intern/BOP_Merge2.cpp
+       intern/BOP_Mesh.cpp
+       intern/BOP_Segment.cpp
+       intern/BOP_Splitter.cpp
+       intern/BOP_Tag.cpp
+       intern/BOP_Triangulator.cpp
+       intern/BOP_Vertex.cpp
 
-BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
+       extern/BOP_Interface.h
+       intern/BOP_BBox.h
+       intern/BOP_BSPNode.h
+       intern/BOP_BSPTree.h
+       intern/BOP_Chrono.h
+       intern/BOP_Edge.h
+       intern/BOP_Face.h
+       intern/BOP_Face2Face.h
+       intern/BOP_Indexs.h
+       intern/BOP_MathUtils.h
+       intern/BOP_Merge.h
+       intern/BOP_Merge2.h
+       intern/BOP_Mesh.h
+       intern/BOP_Misc.h
+       intern/BOP_Segment.h
+       intern/BOP_Splitter.h
+       intern/BOP_Tag.h
+       intern/BOP_Triangulator.h
+       intern/BOP_Vertex.h
+)
+
+blender_add_lib(bf_intern_bop "${SRC}" "${INC}")
diff --git a/intern/boolop/Makefile b/intern/boolop/Makefile
deleted file mode 100644 (file)
index a7a08f6..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-#
-# $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): Hans Lambermont, GSR
-#
-# ***** END GPL LICENSE BLOCK *****
-# bsp main makefile.
-#
-
-include nan_definitions.mk
-
-LIBNAME = boolop
-SOURCEDIR = intern/$(LIBNAME)
-DIR = $(OCGDIR)/$(SOURCEDIR)
-DIRS = intern
-# not yet TESTDIRS = test
-
-include nan_subdirs.mk
-
-install:  $(ALL_OR_DEBUG)
-       @[ -d $(NAN_BOOLOP) ] || mkdir $(NAN_BOOLOP)
-       @[ -d $(NAN_BOOLOP)/include ] || mkdir $(NAN_BOOLOP)/include
-       @[ -d $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BOOLOP)/lib/$(DEBUG_DIR)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libboolop.a $(NAN_BOOLOP)/lib/$(DEBUG_DIR)
-ifeq ($(OS),darwin)
-       ranlib $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
-endif
-       @../tools/cpifdiff.sh extern/*.h $(NAN_BOOLOP)/include/
-
-
-
-
index d9b3941..ffb940b 100644 (file)
@@ -59,7 +59,7 @@ BOP_BSPNode::~BOP_BSPNode()
  * @param plane face plane.
  */
 
-unsigned int BOP_BSPNode::addFace(BOP_BSPPoints pts,
+unsigned int BOP_BSPNode::addFace(const BOP_BSPPoints& pts,
                                                                  const MT_Plane3& plane )
 {
        unsigned int newDeep = 0;
index 9cc9a9d..9ebd669 100644 (file)
@@ -33,7 +33,7 @@
 #include "BOP_Face.h"
 
 typedef vector<MT_Point3> BOP_BSPPoints;
-typedef vector<MT_Point3>::iterator BOP_IT_BSPPoints;
+typedef vector<MT_Point3>::const_iterator BOP_IT_BSPPoints;
 
 class BOP_BSPNode
 {
@@ -47,7 +47,7 @@ public:
        // Construction methods
        BOP_BSPNode(const MT_Plane3& plane);
        ~BOP_BSPNode();
-       unsigned int addFace(BOP_BSPPoints pts, 
+       unsigned int addFace(const BOP_BSPPoints& pts, 
                                                 const MT_Plane3& plane);
        BOP_TAG classifyFace(const MT_Point3& p1, 
                                                 const MT_Point3& p2, 
index 99116b7..ff15751 100644 (file)
@@ -80,7 +80,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType                    opType,
                                                                                CSG_FaceIteratorDescriptor    obBFaces,
                                                                                CSG_VertexIteratorDescriptor  obBVertices)
 {
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        cout << "BEGIN BOP_performBooleanOperation" << endl;
        #endif
 
@@ -118,7 +118,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType                    opType,
        // Invert the output mesh if is required
        *outputMesh = BOP_exportMesh(&meshC, invertMeshC);
 
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        cout << "END BOP_performBooleanOperation" << endl;
        #endif
        
@@ -141,7 +141,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
                                                                   bool       invertMeshA,
                                                                   bool       invertMeshB)
 {
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        BOP_Chrono chrono;
        float t = 0.0f;
        float c = 0.0f;
@@ -156,7 +156,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        BOP_BSPTree bspB;
        bspB.addMesh(meshC, *facesB);
 
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Create BSP     " << c << endl; 
        #endif
@@ -172,7 +172,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        if ((0.25*facesB->size()) > bspA.getDeep())
          BOP_meshFilter(meshC, facesB, &bspA);
        
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "mesh Filter    " << c << endl; 
        #endif
@@ -180,7 +180,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        // Face 2 Face
        BOP_Face2Face(meshC,facesA,facesB);
 
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Face2Face      " << c << endl;
        #endif
@@ -189,7 +189,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        BOP_meshClassify(meshC,facesA,&bspB);
        BOP_meshClassify(meshC,facesB,&bspA);
        
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Classification " << c << endl;
        #endif
@@ -197,7 +197,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        // Process overlapped faces
        BOP_removeOverlappedFaces(meshC,facesA,facesB);
        
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Remove overlap " << c << endl;
        #endif
@@ -205,7 +205,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
        // Sew two meshes
        BOP_sew(meshC,facesA,facesB);
 
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Sew            " << c << endl;
        #endif
@@ -238,7 +238,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
 #endif
 #endif
 
-       #ifdef DEBUG
+       #ifdef BOP_DEBUG
        c = chrono.stamp(); t += c;
        cout << "Merge faces    " << c << endl;
        cout << "Total          " << t << endl;
index ad9f832..2ef8b5b 100644 (file)
@@ -70,7 +70,7 @@ void dumpmesh ( BOP_Mesh *m, bool force )
        }
        if( nonmanifold )
                cout << nonmanifold << " edges detected" << endl;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
        cout << "---------------------------" << endl;
 
        BOP_Edges edges = m->getEdges();
@@ -130,7 +130,7 @@ void BOP_Merge2::mergeFaces(BOP_Mesh *m, BOP_Index v)
 {
        m_mesh = m;
 
-#ifdef DEBUG
+#ifdef BOP_DEBUG
        cout << "##############################" << endl;
 #endif
        cleanup( );
@@ -147,7 +147,7 @@ void BOP_Merge2::mergeFaces(BOP_Mesh *m, BOP_Index v)
                // ... and merge new faces
                if( cont ) cont = mergeFaces();
 
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "called mergeFaces " << cont << endl;
 #endif
                // ... until the merge is not succesful
@@ -186,7 +186,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                unsigned short facecount = 0;
                bool found = false;
                BOP_Indexs vertList;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "  first edge is " << (*it) << endl;
 #endif
                vertList.push_back(first);
@@ -214,7 +214,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                                edge = NULL;
                        }
                        if( !edge ) break;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                        cout << "   next edge is " << edge << endl;
 #endif
                        tmpface = m->getFace(edge->getFaces().front());
@@ -231,7 +231,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                }
                if(found) {
                        edge = *it;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                        cout << "   --> found a loop" << endl;
 #endif
                        if( vertList.size() == 3 ) {
@@ -241,7 +241,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                                BOP_Face4 *face = (BOP_Face4 *)m->getFace(edge->getFaces().front());
                                face->getNeighbours(first,last,next,last);
                        } else {
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                cout << "loop has " << vertList.size() << "verts"; 
 #endif
                                continue;
@@ -253,7 +253,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                                BOP_Face3 *f = new BOP_Face3(next,first,last,
                                        oface1->getPlane(),oface1->getOriginalFace());
                                m->addFace( f );
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                cout << "   face is backward: " << f << endl;
 #endif
                                
@@ -261,7 +261,7 @@ void clean_nonmanifold( BOP_Mesh *m )
                                BOP_Face3 *f = new BOP_Face3(last,first,next,
                                        oface1->getPlane(),oface1->getOriginalFace());
                                m->addFace( f );
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                cout << "   face is forward: " << f << endl;
 #endif
                        }
@@ -366,7 +366,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
                BOP_LFaces facesByOriginalFace;
                BOP_Index v = mergeVertices[i];
                BOP_Vertex *vert = m_mesh->getVertex(v);
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "i = " << i << ", v = " << v << ", vert = " << vert << endl;
                if (v==48)
                        cout << "found vert 48" << endl;
@@ -381,7 +381,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
                                vert->setTAG(BROKEN);
                                break;
                        case 2: {
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                cout << "size of fBOF = " << facesByOriginalFace.size() << endl;
 #endif
                                BOP_Faces ff = facesByOriginalFace.front();
@@ -391,7 +391,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
 
                                // look for two edges adjacent to v which contain both ofaces
                                BOP_Indexs edges = vert->getEdges();
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                cout << "   ff has " << ff.size() << " faces" << endl;
                                cout << "   fb has " << fb.size() << " faces" << endl;
                                cout << "   v  has " << edges.size() << " edges" << endl;
@@ -400,14 +400,14 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
                                                ++it ) {
                                        BOP_Edge *edge = m_mesh->getEdge(*it);
                                        BOP_Indexs faces = edge->getFaces();
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                        cout << "  " << edge << " has " << edge->getFaces().size() << " faces" << endl;
 #endif
                                        if( faces.size() == 2 ) {
                                                BOP_Face *f0 = m_mesh->getFace(faces[0]);
                                                BOP_Face *f1 = m_mesh->getFace(faces[1]);
                                                if( f0->getOriginalFace() != f1->getOriginalFace() ) {
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                                        cout << "   " << f0 << endl;
                                                        cout << "   " << f1 << endl;
 #endif
@@ -416,14 +416,14 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
                                        }
                                }
                                if(ecount == 2) {
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                        cout << "   edge indexes are " << eindexs[0];
                                        cout << " and " << eindexs[1] << endl;
 #endif
                                        BOP_Edge *edge = m_mesh->getEdge(eindexs[0]);
                                        BOP_Index N = edge->getVertex1();
                                        if(N == v) N = edge->getVertex2();
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                        cout << "    ## OK, replace "<<v<<" with "<<N << endl;
 #endif
                                        mergeVertex(ff , v, N );
@@ -437,7 +437,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
                                        }
                                        didMerge = true;
                                }       
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                                else {
                                        cout << "   HUH: ecount was " << ecount << endl;
                                }
@@ -461,7 +461,7 @@ void BOP_Merge2::mergeVertex(BOP_Faces &faces, BOP_Index v1, BOP_Index v2)
                else
                        mergeVertex((BOP_Face4 *) *face, v1, v2);
                (*face)->setTAG(BROKEN);
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "  breaking " << (*face) << endl;
 #endif
        }
@@ -506,7 +506,7 @@ void BOP_Merge2::mergeVertex(BOP_Face3 *face, BOP_Index v1, BOP_Index v2)
        if( prev != v2 && next != v2 ) {
                m_mesh->addFace( new BOP_Face3(prev,v2,next,
                                        face->getPlane(),face->getOriginalFace()) );
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "mv3: add " << prev << "," << v2 << "," << next << endl;
        } else {
                cout << "mv3: vertex already in tri: doing nothing" << endl;
@@ -524,7 +524,7 @@ void BOP_Merge2::mergeVertex(BOP_Face4 *face, BOP_Index v1, BOP_Index v2)
        if( prev == v2 || next == v2 ) {
                m_mesh->addFace( new BOP_Face3(prev,next,opp,
                                        face->getPlane(),face->getOriginalFace()) );
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "mv4a: add " << prev << "," << next << "," << opp << endl;
 #endif
        }
@@ -532,7 +532,7 @@ void BOP_Merge2::mergeVertex(BOP_Face4 *face, BOP_Index v1, BOP_Index v2)
        else {
                m_mesh->addFace( new BOP_Face4(prev,v2,next,opp,
                                        face->getPlane(),face->getOriginalFace()) );
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                cout << "mv4b: add "<<prev<<","<<v2<<","<<next<<","<<opp<<endl;
 #endif
        }
@@ -570,7 +570,7 @@ bool BOP_Merge2::createQuads()
                                // Set triangles to BROKEN
                                deleteFace(m_mesh, *faceI);
                                deleteFace(m_mesh, *faceJ);
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                        cout << "createQuad: del " << *faceI << endl;
                        cout << "createQuad: del " << *faceJ << endl;
                        cout << "createQuad: add " << faceK << endl;
@@ -602,7 +602,7 @@ bool BOP_Merge2::createQuads()
                                // Set triangles to BROKEN
                                deleteFace(m_mesh, *faceI);
                                deleteFace(m_mesh, *faceJ);
-#ifdef DEBUG
+#ifdef BOP_DEBUG
                        cout << "createQuad: del " << *faceI << endl;
                        cout << "createQuad: del " << *faceJ << endl;
                        cout << "createQuad: add " << faceK << endl;
diff --git a/intern/boolop/intern/Makefile b/intern/boolop/intern/Makefile
deleted file mode 100644 (file)
index 6fc8d44..0000000
+++ /dev/null
@@ -1,48 +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 *****
-# string intern Makefile
-#
-
-LIBNAME = boolop
-DIR = $(OCGDIR)/intern/$(LIBNAME)
-DIRS = common
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_2_CPP_WARNINGS)
-
-CPPFLAGS += -I../extern
-CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I$(NAN_MEMUTIL)/include
-CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
-CPPFLAGS += -I$(NAN_CONTAINER)/include
-CPPFLAGS += -I../../../source/blender/makesdna
-CPPFLAGS += -I../../../source/blender/blenlib
-CPPFLAGS += -Icommon
-
-
diff --git a/intern/boolop/make/msvc_6_0/boolop.dsp b/intern/boolop/make/msvc_6_0/boolop.dsp
deleted file mode 100644 (file)
index d4e0025..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-# Microsoft Developer Studio Project File - Name="boolop" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-\r
-CFG=boolop - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "boolop.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "boolop.mak" CFG="boolop - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "boolop - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "boolop - Win32 Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "boolop - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Target_Dir ""\r
-LINK32=link.exe -lib\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD BASE RSC /l 0x407 /d "NDEBUG"\r
-# ADD RSC /l 0x407 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Cmds=ECHO copy to lib folder XCOPY /Y .\release\*.lib ..\..\..\..\..\lib\windows\boolop\lib\*.lib\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "boolop - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Target_Dir ""\r
-LINK32=link.exe -lib\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD BASE RSC /l 0x407 /d "_DEBUG"\r
-# ADD RSC /l 0x407 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "boolop - Win32 Release"\r
-# Name "boolop - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BBox.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BSPNode.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BSPTree.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Edge.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Face.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Face2Face.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Interface.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_MathUtils.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Merge.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Mesh.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Segment.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Splitter.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Tag.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Triangulator.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Vertex.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BBox.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BSPNode.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_BSPTree.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Chrono.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Edge.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Face.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Face2Face.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Indexs.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_MathUtils.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Merge.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Mesh.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Segment.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Splitter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Tag.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Triangulator.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BOP_Vertex.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/intern/boolop/make/msvc_7_0/boolop.vcproj b/intern/boolop/make/msvc_7_0/boolop.vcproj
deleted file mode 100644 (file)
index 6e6d6ab..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="boolop"
-       ProjectGUID="{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Blender Debug|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\debug"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\debug"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               BufferSecurityCheck="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\debug\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\debug\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\debug\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\debug\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libboolop.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BOOLOP files library (debug target) to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Blender Release|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libboolop.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BOOLOP files library to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="3DPlugin Release|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libboolop.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BOOLOP files library to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="3DPlugin Debug|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libboolop.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BOOLOP files library (debug target) to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="intern"
-                       Filter="">
-                       <Filter
-                               Name="Source Files"
-                               Filter="">
-                               <File
-                                       RelativePath="..\..\intern\BOP_BBox.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_BSPNode.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_BSPTree.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Edge.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Face.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Face2Face.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Interface.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_MathUtils.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Merge.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Merge2.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Mesh.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Segment.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Splitter.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Tag.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Triangulator.cpp">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Vertex.cpp">
-                               </File>
-                       </Filter>
-                       <Filter
-                               Name="Header Files"
-                               Filter="">
-                               <File
-                                       RelativePath="..\..\intern\BOP_BBox.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_BSPNode.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_BSPTree.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Chrono.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Edge.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Face.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Face2Face.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Indexs.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_MathUtils.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Merge.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Merge2.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Mesh.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Misc.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Segment.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Splitter.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Tag.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Triangulator.h">
-                               </File>
-                               <File
-                                       RelativePath="..\..\intern\BOP_Vertex.h">
-                               </File>
-                       </Filter>
-               </Filter>
-               <Filter
-                       Name="extern"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\extern\BOP_Interface.h">
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/intern/boolop/make/msvc_9_0/boolop.vcproj b/intern/boolop/make/msvc_9_0/boolop.vcproj
deleted file mode 100644 (file)
index 357d189..0000000
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="INT_boolop"\r
-       ProjectGUID="{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}"\r
-       RootNamespace="boolop"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Blender Debug|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\debug"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\debug"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               BufferSecurityCheck="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\debug\bsplib.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libboolop.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               Description="Copying BOOLOP files library (debug target) to lib tree"\r
-                               CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Blender Release|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="2"\r
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\bsplib.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libboolop.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               Description="Copying BOOLOP files library to lib tree"\r
-                               CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="3DPlugin Release|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="2"\r
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\bsplib.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libboolop.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               Description="Copying BOOLOP files library to lib tree"\r
-                               CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="3DPlugin Debug|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\bsplib.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libboolop.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               Description="Copying BOOLOP files library (debug target) to lib tree"\r
-                               CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="intern"\r
-                       >\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BBox.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BSPNode.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BSPTree.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Edge.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Face.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Face2Face.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Interface.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_MathUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Merge.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Merge2.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Mesh.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Segment.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Splitter.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Tag.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Triangulator.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Vertex.cpp"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BBox.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BSPNode.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_BSPTree.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Chrono.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Edge.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Face.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Face2Face.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Indexs.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_MathUtils.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Merge.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Merge2.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Mesh.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Misc.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Segment.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Splitter.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Tag.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Triangulator.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\intern\BOP_Vertex.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="extern"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\extern\BOP_Interface.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
index debbc86..2e61531 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
        ./intern
        ../container
        ../moto/include
        ../memutil
 )
 
-FILE(GLOB SRC intern/*.cpp)
+set(SRC
+       intern/BSP_CSGMesh.cpp
+       intern/BSP_MeshPrimitives.cpp
+       intern/CSG_BooleanOps.cpp
 
-BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
+       extern/CSG_BooleanOps.h
+       intern/BSP_CSGException.h
+       intern/BSP_CSGMesh.h
+       intern/BSP_CSGMesh_CFIterator.h
+       intern/BSP_MeshPrimitives.h
+)
+
+blender_add_lib(bf_intern_bsp "${SRC}" "${INC}")
diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile
deleted file mode 100644 (file)
index cd16532..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-#
-# $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): Hans Lambermont, GSR
-#
-# ***** END GPL LICENSE BLOCK *****
-# bsp main makefile.
-#
-
-include nan_definitions.mk
-
-LIBNAME = bsp
-SOURCEDIR = intern/$(LIBNAME)
-DIR = $(OCGDIR)/$(SOURCEDIR)
-DIRS = intern
-# not yet TESTDIRS = test
-
-include nan_subdirs.mk
-
-install: $(ALL_OR_DEBUG)
-       @[ -d $(NAN_BSP) ] || mkdir $(NAN_BSP)
-       @[ -d $(NAN_BSP)/include ] || mkdir $(NAN_BSP)/include
-       @[ -d $(NAN_BSP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BSP)/lib/$(DEBUG_DIR)
-       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbsp.a $(NAN_BSP)/lib/$(DEBUG_DIR)
-ifeq ($(OS),darwin)
-       ranlib $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
-endif
-       @../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/
-
-
diff --git a/intern/bsp/intern/Makefile b/intern/bsp/intern/Makefile
deleted file mode 100644 (file)
index 99a21fd..0000000
+++ /dev/null
@@ -1,45 +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 *****
-# string intern Makefile
-#
-
-LIBNAME = bsp
-DIR = $(OCGDIR)/intern/$(LIBNAME)
-DIRS = common
-
-include nan_compile.mk
-
-CCFLAGS += $(LEVEL_2_CPP_WARNINGS)
-
-CPPFLAGS += -I../extern
-CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I$(NAN_MEMUTIL)/include
-CPPFLAGS += -I$(NAN_CONTAINER)/include
-CPPFLAGS += -Icommon
-
-
diff --git a/intern/bsp/make/msvc6_0/bsplib.dsp b/intern/bsp/make/msvc6_0/bsplib.dsp
deleted file mode 100644 (file)
index 703a632..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bsplib" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-\r
-CFG=bsplib - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bsplib.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bsplib.mak" CFG="bsplib - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "bsplib - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "bsplib - Win32 Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "bsplib - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\"\r
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\"\r
-# PROP Target_Dir ""\r
-LINK32=link.exe -lib\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD BASE RSC /l 0x413 /d "NDEBUG"\r
-# ADD RSC /l 0x413 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\libbsp.lib"\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Cmds=ECHO Copying header files       XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\       ECHO Copying lib        XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\..\lib\windows\bsp\lib\*.a        ECHO Done\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "bsplib - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\debug"\r
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\debug"\r
-# PROP Target_Dir ""\r
-LINK32=link.exe -lib\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/memutil" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "../../../../../lib/windows/memutil/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c\r
-# ADD BASE RSC /l 0x413 /d "_DEBUG"\r
-# ADD RSC /l 0x413 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\debug\libbsp.lib"\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Cmds=ECHO Copying header files       XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\       ECHO Copying lib        XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\..\lib\windows\bsp\lib\debug\*.a    ECHO Copying Debug info.        XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\..\lib\windows\bsp\lib\debug\      ECHO Done\r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "bsplib - Win32 Release"\r
-# Name "bsplib - Win32 Debug"\r
-# Begin Group "intern"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_CSGException.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_CSGISplitter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_CSGMesh.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_CSGMesh.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_CSGMesh_CFIterator.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_MeshPrimitives.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\BSP_MeshPrimitives.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\intern\CSG_BooleanOps.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "extern"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\extern\CSG_BooleanOps.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/intern/bsp/make/msvc6_0/bsplib.dsw b/intern/bsp/make/msvc6_0/bsplib.dsw
deleted file mode 100644 (file)
index de8cdcd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "bsplib"=.\bsplib.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
diff --git a/intern/bsp/make/msvc_7_0/bsplib.sln b/intern/bsp/make/msvc_7_0/bsplib.sln
deleted file mode 100644 (file)
index e8c116b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsplib", "bsplib.vcproj", "{20F0EE62-A21A-46B7-B425-7923F4674B4F}"
-EndProject
-Global
-       GlobalSection(SolutionConfiguration) = preSolution
-               ConfigName.0 = Debug
-               ConfigName.1 = Release
-       EndGlobalSection
-       GlobalSection(ProjectDependencies) = postSolution
-       EndGlobalSection
-       GlobalSection(ProjectConfiguration) = postSolution
-               {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Debug.ActiveCfg = Debug|Win32
-               {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Debug.Build.0 = Debug|Win32
-               {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Release.ActiveCfg = Release|Win32
-               {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Release.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ExtensibilityGlobals) = postSolution
-       EndGlobalSection
-       GlobalSection(ExtensibilityAddIns) = postSolution
-       EndGlobalSection
-EndGlobal
diff --git a/intern/bsp/make/msvc_7_0/bsplib.vcproj b/intern/bsp/make/msvc_7_0/bsplib.vcproj
deleted file mode 100644 (file)
index 59fb9f3..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="bsplib"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Blender Debug|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\debug"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\debug"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include"
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               BufferSecurityCheck="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\debug\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\debug\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\debug\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\debug\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libbsp.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BSP files library (debug target) to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Blender Release|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include"
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libbsp.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BSP files library to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="3DPlugin Release|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="2"
-                               AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include"
-                               PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libbsp.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BSP files library to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="3DPlugin Debug|Win32"
-                       OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug"
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include"
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               UsePrecompiledHeader="2"
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\bsplib.pch"
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\"
-                               ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\"
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\"
-                               WarningLevel="2"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libbsp.lib"
-                               SuppressStartupBanner="TRUE"/>
-                       <Tool
-                               Name="VCMIDLTool"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Copying BSP files library (debug target) to lib tree"
-                               CommandLine="ECHO Copying header files
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include
-XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include
-ECHO Done
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1043"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="intern"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\intern\BSP_CSGException.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\BSP_CSGMesh.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\BSP_CSGMesh.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\BSP_CSGMesh_CFIterator.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\BSP_MeshPrimitives.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\BSP_MeshPrimitives.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\CSG_BooleanOps.cpp">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="extern"
-                       Filter="">
-                       <File
-                               RelativePath="..\..\extern\CSG_BooleanOps.h">
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/intern/bsp/make/msvc_9_0/bsplib.vcproj b/intern/bsp/make/msvc_9_0/bsplib.vcproj
deleted file mode 100644 (file)
index ed6978b..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="INT_bsplib"\r
-       ProjectGUID="{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}"\r
-       RootNamespace="bsplib"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Blender Debug|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\debug"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\debug"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\container\include"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               BufferSecurityCheck="true"\r
-                               UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bsp\debug\bsplib.pch"\r
-                               AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"\r
-                               ObjectFile="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"\r
-                               ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"\r
-                               WarningLevel="2"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1043"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libbsp.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               Description="Copying BSP files library (debug target) to lib tree"\r
-                               CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bsp\include&#x0D;&#x0A;XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\bsp\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Blender Release|Win32"\r
-                       OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp"\r
-                       IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp"\r
-                       ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-             &