Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

12 files changed, 1277 insertions, 89 deletions

diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index 54fc13293eb..2be20a24042 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -10,7 +10,11 @@ if env['WITH_BF_OPENAL']:
 	sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
 	incs += ' ' + env['BF_OPENAL_INC']
 	incs += ' ' + env['BF_SDL_INC']
+	defs = 'USE_OPENAL'
 else:
 	defs = 'NO_SOUND'
 
+if not env['WITH_BF_SDL']:
+	defs += ' DISABLE_SDL'
+
 env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] )
diff --git a/intern/SoundSystem/SND_Utils.h b/intern/SoundSystem/SND_Utils.h
index c54aa434eec..26cf1bda11c 100644
--- a/intern/SoundSystem/SND_Utils.h
+++ b/intern/SoundSystem/SND_Utils.h
@@ -97,8 +97,8 @@ extern unsigned int SND_GetSampleFormat(void* sample);
 extern unsigned int SND_GetNumberOfChannels(void* sample);
 extern unsigned int SND_GetSampleRate(void* sample);
 extern unsigned int SND_GetBitRate(void* sample);
-extern unsigned int SND_GetNumberOfSamples(void* sample);
-extern unsigned int SND_GetHeaderSize(void* sample);
+extern unsigned int SND_GetNumberOfSamples(void* sample, int sample_length);
+extern unsigned int SND_GetHeaderSize(void* sample, int sample_length);
 extern unsigned int SND_GetExtraChunk(void* sample);
 
 extern void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot);
diff --git a/intern/SoundSystem/SoundDefines.h b/intern/SoundSystem/SoundDefines.h
index 5d425a8dc94..450fde187b5 100644
--- a/intern/SoundSystem/SoundDefines.h
+++ b/intern/SoundSystem/SoundDefines.h
@@ -44,7 +44,7 @@ enum
 
 /* general stuff */
 #define NUM_BUFFERS						128
-#define NUM_SOURCES						16
+#define NUM_SOURCES						24 /* 24 is the limit for openal on windows, was 16 in 2.47 and previous */
 
 /* openal related stuff */
 #define AL_LOOPING						0x1007
diff --git a/intern/SoundSystem/fmod/SND_FmodDevice.cpp b/intern/SoundSystem/fmod/SND_FmodDevice.cpp
index cc252954fea..3ba0802a5b0 100644
--- a/intern/SoundSystem/fmod/SND_FmodDevice.cpp
+++ b/intern/SoundSystem/fmod/SND_FmodDevice.cpp
@@ -162,7 +162,7 @@ SND_WaveSlot* SND_FmodDevice::LoadSample(const STR_String& name,
 						int numberofchannels = SND_GetNumberOfChannels(memlocation);
 						int samplerate = SND_GetSampleRate(memlocation);
 						int bitrate = SND_GetBitRate(memlocation);
-						int numberofsamples = SND_GetNumberOfSamples(memlocation);
+						int numberofsamples = SND_GetNumberOfSamples(memlocation, size);
 						
 						waveslot->SetFileSize(size);
 						waveslot->SetData(memlocation);
diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp
index bbf971ddc87..9d050a81161 100644
--- a/intern/SoundSystem/intern/SND_Scene.cpp
+++ b/intern/SoundSystem/intern/SND_Scene.cpp
@@ -388,11 +388,18 @@ void SND_Scene::UpdateActiveObects()
 #endif
 #ifdef USE_OPENAL
 			// ok, properties Set. now see if it must play
-			if (pObject->GetPlaystate() == SND_MUST_PLAY)
-			{
+			switch (pObject->GetPlaystate()){
+			case SND_MUST_PLAY:
 				m_audiodevice->PlayObject(id);
 				pObject->SetPlaystate(SND_PLAYING);
-				//break;
+				break;
+			case SND_MUST_STOP:
+				RemoveActiveObject(pObject);
+				break;
+			case SND_MUST_PAUSE:
+				m_audiodevice->PauseObject(id);
+				pObject->SetPlaystate(SND_PAUSED);
+				break;
 			}
 #endif
 
diff --git a/intern/SoundSystem/intern/SND_SoundObject.cpp b/intern/SoundSystem/intern/SND_SoundObject.cpp
index e514a186e5e..7a244b5090d 100644
--- a/intern/SoundSystem/intern/SND_SoundObject.cpp
+++ b/intern/SoundSystem/intern/SND_SoundObject.cpp
@@ -91,21 +91,24 @@ SND_SoundObject::~SND_SoundObject()
 
 void SND_SoundObject::StartSound()
 {
-	m_playstate = SND_MUST_PLAY;
+	if (m_id >= 0)
+		m_playstate = SND_MUST_PLAY;
 }
 
 
 
 void SND_SoundObject::StopSound()
 {
-	m_playstate = SND_MUST_STOP;
+	if (m_id >= 0)
+		m_playstate = SND_MUST_STOP;
 }
 
 
 
 void SND_SoundObject::PauseSound()
 {
-	m_playstate = SND_MUST_PAUSE;
+	if (m_id >= 0)
+		m_playstate = SND_MUST_PAUSE;
 }
 
 
diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp
index 7d441964b24..26ce106a24e 100644
--- a/intern/SoundSystem/intern/SND_Utils.cpp
+++ b/intern/SoundSystem/intern/SND_Utils.cpp
@@ -34,19 +34,19 @@
 #include "SND_Utils.h"
 #include "SoundDefines.h"
 #include "SND_DependKludge.h"
-/*
-extern "C" { 
-#include "license_key.h"
-}
-*/
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <math.h>
 #include <string.h>
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #include <io.h>
+#define open _open
+#define read _read
+#define close _close
+#define write _write
+#define lseek _lseek
 #else
 #include <unistd.h>
 #endif
@@ -204,7 +204,7 @@ bool SND_IsSampleValid(const STR_String& name, void* memlocation)
 
 
 /* checks if the passed pointer is a valid sample */
-bool CheckSample(void* sample)
+static bool CheckSample(void* sample)
 {
 	bool valid = false;
 	char buffer[32];
@@ -290,26 +290,32 @@ unsigned int SND_GetBitRate(void* sample)
 
 
 /* gets the length of the actual sample data (without the header) */
-unsigned int SND_GetNumberOfSamples(void* sample)
+unsigned int SND_GetNumberOfSamples(void* sample, int sample_length)
 {
-	unsigned int chunklength, length = 0, offset = 16;
-	char data[4];
-	
+	unsigned int chunklength, length = 0, offset;
+	unsigned short block_align;
 	if (CheckSample(sample))
 	{
-		memcpy(&chunklength, ((char*)sample) + offset, 4);
+		memcpy(&chunklength, ((char*)sample) + 16, 4);
+		memcpy(&block_align, ((char*)sample) + 32, 2); /* always 2 or 4 it seems */
+		
 		/* This was endian unsafe. See top of the file for the define. */
-		if (SND_fEndian == SND_endianBig) SWITCH_INT(chunklength);
-
-		offset = offset + chunklength + 4;
-		memcpy(data, ((char*)sample) + offset, 4);
+		if (SND_fEndian == SND_endianBig)
+		{
+			SWITCH_INT(chunklength);
+			SWITCH_SHORT(block_align);
+		}
+				
+		offset = 16 + chunklength + 4;
 
 		/* This seems very unsafe, what if data is never found (f.i. corrupt file)... */
 		// lets find "data"
-		while (memcmp(data, "data", 4))
+		while (memcmp(((char*)sample) + offset, "data", 4))
 		{
-			offset += 4;
-			memcpy(data, ((char*)sample) + offset, 4);
+			offset += block_align;
+			
+			if (offset+block_align > sample_length) /* save us from crashing */
+				return 0;
 		}
 		offset += 4;
 		memcpy(&length, ((char*)sample) + offset, 4);
@@ -324,34 +330,38 @@ unsigned int SND_GetNumberOfSamples(void* sample)
 
 
 /* gets the size of the entire header (file - sampledata) */
-unsigned int SND_GetHeaderSize(void* sample)
+unsigned int SND_GetHeaderSize(void* sample, int sample_length)
 {
 	unsigned int chunklength, headersize = 0, offset = 16;
-	char data[4];
-	
+	unsigned short block_align;
 	if (CheckSample(sample))
 	{
 		memcpy(&chunklength, ((char*)sample) + offset, 4);
+		memcpy(&block_align, ((char*)sample) + 32, 2); /* always 2 or 4 it seems */
+		
 		/* This was endian unsafe. See top of the file for the define. */
-		if (SND_fEndian == SND_endianBig) SWITCH_INT(chunklength);
+		if (SND_fEndian == SND_endianBig)
+		{
+			SWITCH_INT(chunklength);
+			SWITCH_SHORT(block_align);
+		}
 		offset = offset + chunklength + 4;
-		memcpy(data, ((char*)sample) + offset, 4);
 
 		// lets find "data"
-		while (memcmp(data, "data", 4))
+		while (memcmp(((char*)sample) + offset, "data", 4))
 		{
-			offset += 4;
-			memcpy(data, ((char*)sample) + offset, 4);
+			offset += block_align;
+			
+			if (offset+block_align > sample_length) /* save us from crashing */
+				return 0;
 		}
 		headersize = offset + 8;
 	}
 
-
 	return headersize;
 }
 
 
-
 unsigned int SND_GetExtraChunk(void* sample)
 {
 	unsigned int extrachunk = 0, chunklength, offset = 16;
@@ -387,58 +397,60 @@ void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot)
 	if (CheckSample(sample))
 	{
 		memcpy(&fileheader, sample, sizeof(WavFileHeader));
-		fileheader.size = SND_GetHeaderSize(sample);
-		sample += sizeof(WavFileHeader);
-		fileheader.size = ((fileheader.size+1) & ~1) - 4;
+		fileheader.size = SND_GetHeaderSize(sample, waveslot->GetFileSize());
+		if (fileheader.size) { /* this may fail for corrupt files */
+			sample += sizeof(WavFileHeader);
+			fileheader.size = ((fileheader.size+1) & ~1) - 4;
 
-		while ((fileheader.size > 0) && (memcpy(&chunkheader, sample, sizeof(WavChunkHeader))))
-		{
-			sample += sizeof(WavChunkHeader);
-			if (!memcmp(chunkheader.id, "fmt ", 4))
+			while ((fileheader.size > 0) && (memcpy(&chunkheader, sample, sizeof(WavChunkHeader))))
 			{
-				memcpy(&fmtheader, sample, sizeof(WavFmtHeader));
-				waveslot->SetSampleFormat(fmtheader.format);
-
-				if (fmtheader.format == 0x0001)
+				sample += sizeof(WavChunkHeader);
+				if (!memcmp(chunkheader.id, "fmt ", 4))
 				{
-					waveslot->SetNumberOfChannels(fmtheader.numberofchannels);
-					waveslot->SetBitRate(fmtheader.bitrate);
-					waveslot->SetSampleRate(fmtheader.samplerate);
-					sample += chunkheader.size;
-				} 
-				else
-				{
-					memcpy(&fmtexheader, sample, sizeof(WavFmtExHeader));
-					sample += chunkheader.size;
-				}
-			}
-			else if (!memcmp(chunkheader.id, "data", 4))
-			{
-				if (fmtheader.format == 0x0001)
-				{
-					waveslot->SetNumberOfSamples(chunkheader.size);
-					sample += chunkheader.size;
+					memcpy(&fmtheader, sample, sizeof(WavFmtHeader));
+					waveslot->SetSampleFormat(fmtheader.format);
+
+					if (fmtheader.format == 0x0001)
+					{
+						waveslot->SetNumberOfChannels(fmtheader.numberofchannels);
+						waveslot->SetBitRate(fmtheader.bitrate);
+						waveslot->SetSampleRate(fmtheader.samplerate);
+						sample += chunkheader.size;
+					} 
+					else
+					{
+						memcpy(&fmtexheader, sample, sizeof(WavFmtExHeader));
+						sample += chunkheader.size;
+					}
 				}
-				else if (fmtheader.format == 0x0011)
+				else if (!memcmp(chunkheader.id, "data", 4))
 				{
-					//IMA ADPCM
+					if (fmtheader.format == 0x0001)
+					{
+						waveslot->SetNumberOfSamples(chunkheader.size);
+						sample += chunkheader.size;
+					}
+					else if (fmtheader.format == 0x0011)
+					{
+						//IMA ADPCM
+					}
+					else if (fmtheader.format == 0x0055)
+					{
+						//MP3 WAVE
+					}
 				}
-				else if (fmtheader.format == 0x0055)
+				else if (!memcmp(chunkheader.id, "smpl", 4))
 				{
-					//MP3 WAVE
+					memcpy(&sampleheader, sample, sizeof(WavSampleHeader));
+					//loop = sampleheader.loops;
+					sample += chunkheader.size;
 				}
-			}
-			else if (!memcmp(chunkheader.id, "smpl", 4))
-			{
-				memcpy(&sampleheader, sample, sizeof(WavSampleHeader));
-				//loop = sampleheader.loops;
-				sample += chunkheader.size;
-			}
-			else
-				sample += chunkheader.size;
+				else
+					sample += chunkheader.size;
 
-			sample += chunkheader.size & 1;
-			fileheader.size -= (((chunkheader.size + 1) & ~1) + 8);
+				sample += chunkheader.size & 1;
+				fileheader.size -= (((chunkheader.size + 1) & ~1) + 8);
+			}
 		}
 	}
 }
diff --git a/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj b/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj
new file mode 100644
index 00000000000..bd75fe88d43
--- /dev/null
+++ b/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="INT_SoundSystem"

+	ProjectGUID="{98330220-47A6-42E0-9DE4-AD0FF5D204D6}"

+	RootNamespace="SoundSystem"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Blender Debug|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug\SoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\soundsystem\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying SND SoundSystem files library (debug target) to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Release|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\SoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\soundsystem\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\soundsystem\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying SND SoundSystem files library to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Release|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\SoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying SND SoundSystem files library to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Debug|Win32"

+			OutputDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug"

+			IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug\SoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug\"

+				ObjectFile="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\soundsystem\mtdll\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="Copying SND SoundSystem files library (debug target) to lib tree."

+				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\SoundSystem\include&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\intern\SND_AudioDevice.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_C-api.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_CDObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_DeviceManager.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_IdObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_Scene.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_SoundListener.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_SoundObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_Utils.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_WaveCache.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_WaveSlot.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="..\..\intern\SND_AudioDevice.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_C-api.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_CDObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_DependKludge.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_DeviceManager.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_IAudioDevice.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\intern\SND_IdObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_Object.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_Scene.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_SoundListener.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_SoundObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_Utils.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_WaveCache.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SND_WaveSlot.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\SoundDefines.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj b/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj
new file mode 100644
index 00000000000..2109d92d430
--- /dev/null
+++ b/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="INT_DummySoundSystem"

+	ProjectGUID="{FAF46346-65CC-4DB2-85C4-B99826F79D0C}"

+	RootNamespace="DummySoundSystem"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Blender Release|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\DummySoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\libDummySoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Debug|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug\DummySoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\debug\libDummySoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Release|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\DummySoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libDummySoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Debug|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug\DummySoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\dummy\mtdll\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libDummySoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\..\dummy\SND_DummyDevice.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="..\..\..\dummy\SND_DummyDevice.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj b/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj
new file mode 100644
index 00000000000..5593f00cb2b
--- /dev/null
+++ b/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="INT_OpenALSoundSystem"

+	ProjectGUID="{213356A9-3A1F-41DA-9819-1297BCD17DEE}"

+	RootNamespace="OpenALSoundSystem"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Blender Debug|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug\OpenALSoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\debug\libOpenALSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Blender Release|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\OpenALSoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\libOpenALSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Release|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include"

+				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\OpenALSoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libOpenALSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="3DPlugin Debug|Win32"

+			OutputDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug"

+			IntermediateDirectory="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\..\build\msvc_9\intern\string\include"

+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				DefaultCharIsUnsigned="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug\OpenALSoundSystem.pch"

+				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug\"

+				ObjectFile="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug\"

+				ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_9\intern\soundsystem\openal\mtdll\debug\"

+				WarningLevel="2"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libOpenALSoundSystem.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\..\openal\SND_OpenALDevice.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\sdl\SND_SDLCDDevice.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="..\..\..\openal\SND_OpenALDevice.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\sdl\SND_SDLCDDevice.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index ebcd0e4aea4..c660e9aecba 100644
--- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp
+++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
@@ -294,6 +294,10 @@ SND_OpenALDevice::SND_OpenALDevice()
 		// let openal generate its sources
 		if (alc_error == ALC_NO_ERROR)
 		{
+			int i;
+
+			for (i=0;i<NUM_SOURCES;i++)
+				m_sources[i] = 0;
 			alGenSources(NUM_SOURCES, m_sources);
 			m_sourcesinitialized = true;
 		}
@@ -329,12 +333,6 @@ SND_OpenALDevice::~SND_OpenALDevice()
 {
 	MakeCurrent();
 	
-	if (m_buffersinitialized)
-	{
-		alDeleteBuffers(NUM_BUFFERS, m_buffers);
-		m_buffersinitialized = false;
-	}
-	
 	if (m_sourcesinitialized)
 	{
 		for (int i = 0; i < NUM_SOURCES; i++)
@@ -344,6 +342,12 @@ SND_OpenALDevice::~SND_OpenALDevice()
 		m_sourcesinitialized = false;
 	}
 	
+	if (m_buffersinitialized)
+	{
+		alDeleteBuffers(NUM_BUFFERS, m_buffers);
+		m_buffersinitialized = false;
+	}
+	
 	if (m_context) {
 		MakeCurrent();
 #ifdef AL_VERSION_1_1
diff --git a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
index 8bb6c642b11..b1bac964c61 100644
--- a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
+++ b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
@@ -41,7 +41,9 @@
 #include "SND_SDLCDDevice.h"
 #include "SoundDefines.h"
 
+#ifndef DISABLE_SDL
 #include <SDL.h>
+#endif
 
 SND_SDLCDDevice::SND_SDLCDDevice() :
 	m_cdrom(NULL),
@@ -55,6 +57,10 @@ SND_SDLCDDevice::SND_SDLCDDevice() :
 
 void SND_SDLCDDevice::init()
 {
+#ifdef DISABLE_SDL
+	fprintf(stderr, "Blender compiled without SDL, no CDROM support\n");
+	return;
+#else
 	if (SDL_InitSubSystem(SDL_INIT_CDROM))
 	{
 		fprintf(stderr, "Error initializing CDROM\n");
@@ -75,19 +81,23 @@ void SND_SDLCDDevice::init()
 	/* Did if open? Check if cdrom is NULL */
 	if(!m_cdrom)
 	{
-		fprintf(stderr, "Couldn't open drive: %s", SDL_GetError());
+		fprintf(stderr, "Couldn't open drive: %s\n", SDL_GetError());
 		return;
 	}
+#endif
 }
 
 SND_SDLCDDevice::~SND_SDLCDDevice()
 {
+#ifndef DISABLE_SDL
 	StopCD();
 	SDL_CDClose(m_cdrom);
+#endif
 }
 
 void SND_SDLCDDevice::NextFrame()
 {
+#ifndef DISABLE_SDL
 	m_frame++;
 	m_frame &= 127;
 	
@@ -111,20 +121,24 @@ void SND_SDLCDDevice::NextFrame()
 		}
 	
 	}
+#endif
 }
 	
 void SND_SDLCDDevice::PlayCD(int track)
 {
+#ifndef DISABLE_SDL
 	if ( m_cdrom && CD_INDRIVE(SDL_CDStatus(m_cdrom)) ) {
 		SDL_CDPlayTracks(m_cdrom, track-1, 0, track, 0);
 		m_cdplaying = true;
 		m_cdtrack = track;
 	}
+#endif
 }
 
 
 void SND_SDLCDDevice::PauseCD(bool pause)
 {
+#ifndef DISABLE_SDL
 	if (!m_cdrom)
 		return;
 		
@@ -132,13 +146,16 @@ void SND_SDLCDDevice::PauseCD(bool pause)
 		SDL_CDPause(m_cdrom);
 	else
 		SDL_CDResume(m_cdrom);
+#endif
 }
 
 void SND_SDLCDDevice::StopCD()
 {
+#ifndef DISABLE_SDL
 	if (m_cdrom)
 		SDL_CDStop(m_cdrom);
 	m_cdplaying = false;
+#endif
 }
 
 void SND_SDLCDDevice::SetCDPlaymode(int playmode)