[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15605] branches/soc-2007-hcube: Added soundsystem to intern solution.

Robert Holcomb bob_holcomb at hotmail.com
Wed Jul 16 17:44:48 CEST 2008


Revision: 15605
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15605
Author:   scourage
Date:     2008-07-16 17:44:47 +0200 (Wed, 16 Jul 2008)

Log Message:
-----------
Added soundsystem to intern solution.  Added tinySDN to external solution. Removed existing sound projects from internal solution.

Modified Paths:
--------------
    branches/soc-2007-hcube/extern/make/msvc_7_0/extern.sln
    branches/soc-2007-hcube/intern/make/msvc_7_0/intern.sln
    branches/soc-2007-hcube/intern/soundsystem/SND_file.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_soundattrs.cpp

Added Paths:
-----------
    branches/soc-2007-hcube/extern/tinySND/make/
    branches/soc-2007-hcube/extern/tinySND/make/msvc_7_0/
    branches/soc-2007-hcube/extern/tinySND/make/msvc_7_0/tinySND.vcproj
    branches/soc-2007-hcube/intern/soundsystem/make/
    branches/soc-2007-hcube/intern/soundsystem/make/msvc_7_0/
    branches/soc-2007-hcube/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj

Modified: branches/soc-2007-hcube/extern/make/msvc_7_0/extern.sln
===================================================================
--- branches/soc-2007-hcube/extern/make/msvc_7_0/extern.sln	2008-07-16 15:41:39 UTC (rev 15604)
+++ branches/soc-2007-hcube/extern/make/msvc_7_0/extern.sln	2008-07-16 15:44:47 UTC (rev 15605)
@@ -51,6 +51,10 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySND", "..\..\tinySND\make\msvc_7_0\tinySND.vcproj", "{E223848A-715C-4DA0-B507-E457E8763E20}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		3D Plugin Debug = 3D Plugin Debug
@@ -237,6 +241,22 @@
 		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Debug.Build.0 = Blender Debug|Win32
 		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Release.ActiveCfg = Blender Release|Win32
 		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Release.Build.0 = Blender Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.3D Plugin Debug.ActiveCfg = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.3D Plugin Debug.Build.0 = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.3D Plugin Release.ActiveCfg = Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.3D Plugin Release.Build.0 = Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Blender Debug.Build.0 = Blender Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Blender Release.ActiveCfg = Blender Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Blender Release.Build.0 = Blender Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.BlenderPlayer Debug.ActiveCfg = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.BlenderPlayer Debug.Build.0 = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.BlenderPlayer Release.ActiveCfg = Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.BlenderPlayer Release.Build.0 = Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Debug.ActiveCfg = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Debug.Build.0 = Debug|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Release.ActiveCfg = Release|Win32
+		{E223848A-715C-4DA0-B507-E457E8763E20}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Added: branches/soc-2007-hcube/extern/tinySND/make/msvc_7_0/tinySND.vcproj
===================================================================
--- branches/soc-2007-hcube/extern/tinySND/make/msvc_7_0/tinySND.vcproj	                        (rev 0)
+++ branches/soc-2007-hcube/extern/tinySND/make/msvc_7_0/tinySND.vcproj	2008-07-16 15:44:47 UTC (rev 15605)
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="tinySND"
+	ProjectGUID="{E223848A-715C-4DA0-B507-E457E8763E20}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/tinySND.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/tinySND.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Blender Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_7\extern\tinySND\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\tinySND\debug"
+			ConfigurationType="4">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\core;..\..\ffmpeg;..\..\samplerate;..\..\sdl;..\..\sndfile;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\sndfile\include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\tinySND\debug\tinySND.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\tinySND\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_7\extern\tinySND\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\tinySND\debug\"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\debug\tinySND.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Copying TINYSND files library (debug target) to lib tree."
+				CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\tinySND\include MKDIR ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\core\SND*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\samplerate\SND*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\sdl\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\sndfile\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\ffmpeg\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+ECHO Done
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Blender Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_7\extern\tinySND"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\tinySND"
+			ConfigurationType="4">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\core;..\..\ffmpeg;..\..\samplerate;..\..\sdl;..\..\sndfile;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\sndfile\include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
+				StringPooling="TRUE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\tinySND\tinySND.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\tinySND\"
+				ObjectFile="..\..\..\..\..\build\msvc_7\extern\tinySND\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\tinySND\"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\debug\tinySND.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Copying TINYSND files library to lib tree."
+				CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\tinySND\include MKDIR ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\core\SND*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\samplerate\SND*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\sdl\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\sndfile\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+XCOPY /Y ..\..\ffmpeg\*.h ..\..\..\..\..\build\msvc_7\extern\tinySND\include
+ECHO Done
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\core\SND_AiffReader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_DataCache.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_DataConsumer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_DataMultiplexer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_FXDuplicator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_FXMixer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\core\SND_FXSample.cpp">
+			</File>
+			<File
+				RelativePath="..\..\samplerate\SND_FXSRC.cpp">

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list