diff options
author | Joseph Gilbert <ascotan@gmail.com> | 2005-02-21 00:33:11 +0300 |
---|---|---|
committer | Joseph Gilbert <ascotan@gmail.com> | 2005-02-21 00:33:11 +0300 |
commit | 61767b4f483613f4060524abd9cb7e74aae355ea (patch) | |
tree | 943f75c63f971117cedaa0351d01eb77500ab203 /intern/SoundSystem | |
parent | 7ad68dd4a6486fdafb94480485eed1702a2b5646 (diff) |
MSVC7 update and freetype2 source
- Added correct .libs to be linked to GP_Ghost
- Fixed incorrect library extensions for the linker (*.lib and not unix *.a)
- Projects have been set to be multi-threaded - projects were being linked to different versions of the CRT
- All projects are now linking to python 2.3 (this fixes an error regarding struct sizes in python)
- Removed invalid source paths from inclusion for the compiler
- Fix dependency issues with the GP_Ghost module
- Proper .dll's are now being copied to their respective locations for debug and release version of blender/blenderplayer
- Warnings have been set to level 2
- Import paths have been updated and organized for the compiler
- Duplicate import paths for the compiler have been removed
- Removed silly silly silly silly unix path-separators from window paths
- Post-Build scripts have been updated where neccessary (XCOPY is retatined)
- Fixed the output of various .lib files (PHY_Sumo and Yafray)
- PHY_Sumo now uses a .pch
- Removed #undef _DEBUG from debug builds :p
- FTF_Font is now contains a debug build and is being set to it's correct output path
- Blender/Blenderplayer/3DPlugin all linkto Debug libs where appropriate (instead of static release libs to avoid conflicts with the CRT)
- Python23_d.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- msvcrtd.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- Post-builds now clean up their mess
- ActiveX controller now builds
- BlenderPlayer now builds
- Internal libs now using .pch
- Moved the build directory from /blender/obj to ../build/msvc_7/ to follow precedence with scons builds
- Builds are now organized to follow precedence with scons builds with a /libs and a /intern /extern /source obj folders
- Set the proper build path for opennl
- Forcing BLO_loader source files to follow project defaults
- Added an 'extern' project that mimics the /make build of the 'intern' project
- Extern build includes solid and it's associated builds, ftgl, and freetype
- Added .vcproj files to /extern directory
- Added new extern.sln file to /extern directory
- All project now link to the built solid.lib from the extern project instead of lib/windows
- Removed uneeded XCOPYs commands from post-builds
- Added conditional Directory building to post-builds
- Freetype2 source commit (this is need for the building of a correct MFC linked version of the activeX controller as well as a correct release and debug build of the blender project)
- Ftgl is built and linked by the 'extern' project
- Intern/Extern project are now exporting their proper header files
- PHY_Physics is now linking to the correct set of header files (in build path not source)
- Makesdna builds object files into build directory now
- Projects are now ignoring the CORRECT versions of the CRT's :)
- Renderconverter is now outputting it's obj file to it's own directory instead of /render
- Gen_system is now being built to ../kernel
- BL_src_cre is now being built to /creator
- *.exp and *.ilk are now being cleaned up from linkers
- Libpng.dll and zlib.dll are now being copied to the /bin
- MTDLL build are now available for the correct projects
- ActiveX 3D Plugin now links correctly to solid and freetype2
- Corrected the Preprocessor #define that was labeled incorrectly in FTF_Font and Blender that was causing the FTGL libs to export dll calling conventions.
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for internal and external librarys
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for blender and added 2 new solutions configurations BlenderPlayer Release, Debug
-
Diffstat (limited to 'intern/SoundSystem')
3 files changed, 442 insertions, 92 deletions
diff --git a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj index 3ecf02c8b30..0aff5489175 100644 --- a/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj +++ b/intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding = "Windows-1252"?> +<?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.00" + Version="7.0" Name="SoundSystem" ProjectGUID="{98330220-47A6-42E0-9DE4-AD0FF5D204D6}" SccProjectName="" @@ -12,9 +12,9 @@ </Platforms> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\debug" - IntermediateDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\debug" + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -22,16 +22,17 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\lib\windows\string\include;..\..\..\..\..\lib\windows\moto\include" + AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\moto\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" + BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\soundsystem\debug/SoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\debug/" - ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\debug/" - ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\debug/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug\SoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug\" + ObjectFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\soundsystem\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> @@ -39,16 +40,16 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\obj\windows\intern\soundsystem\debug\libSoundSystem.lib" + OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libSoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" + Description="Copying SND SoundSystem files library (debug target) to lib tree." CommandLine="ECHO Copying header files -XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h -ECHO Copying lib -XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\debug\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\debug\*.lib +IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include ECHO Done "/> <Tool @@ -61,11 +62,17 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\..\..\..\..\obj\windows\intern\soundsystem" - IntermediateDirectory=".\..\..\..\..\obj\windows\intern\soundsystem" + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -73,34 +80,92 @@ ECHO Done <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\lib\windows\string\include;..\..\..\..\..\lib\windows\moto\include" + AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\moto\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\soundsystem/SoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem/" - ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem/" - ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\SoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\soundsystem\" + ObjectFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\soundsystem\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libSoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Copying SND SoundSystem files library to lib tree." + CommandLine="ECHO Copying header files +IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +ECHO Done +"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Release|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\moto\include" + PreprocessorDefinitions="NDEBUG,WIN32,_LIB" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\SoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\" + ObjectFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\obj\windows\intern\soundsystem\libSoundSystem.lib" + OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libSoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" + Description="Copying SND SoundSystem files library to lib tree." CommandLine="ECHO Copying header files -XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\SoundSystem\include\*.h -ECHO Copying lib -XCOPY /Y ..\..\..\..\obj\windows\intern\soundsystem\*.lib ..\..\..\..\..\lib\windows\SoundSystem\lib\*.lib +IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include ECHO Done "/> <Tool @@ -113,8 +178,73 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Debug|Win32" + OutputDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug" + IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..;..\..\dummy;..\..\openal;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\moto\include" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug\SoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug\" + ObjectFile="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug\" + ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\soundsystem\mtdll\debug\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libSoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Copying SND SoundSystem files library (debug target) to lib tree." + CommandLine="ECHO Copying header files +IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\SoundSystem\include +ECHO Done +"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <Files> <Filter Name="Source Files" diff --git a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj index 78a3885527d..ea3d95bdf93 100644 --- a/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj +++ b/intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding = "Windows-1252"?> +<?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.00" + Version="7.0" Name="DummySoundSystem" ProjectGUID="{FAF46346-65CC-4DB2-85C4-B99826F79D0C}" SccProjectName="" @@ -12,9 +12,9 @@ </Platforms> <Configurations> <Configuration - Name="Release|Win32" - OutputDirectory=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy" - IntermediateDirectory=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy" + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -22,34 +22,30 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem;..\..\..\..\moto\include" + AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/DummySoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/" - ObjectFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/" - ProgramDataBaseFileName=".\..\..\..\..\..\obj\windows\intern\soundsystem\dummy/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\DummySoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\obj\windows\intern\soundsystem\dummy\libDummySoundSystem.lib" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\libDummySoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool - Name="VCPostBuildEventTool" - CommandLine="ECHO Copying lib -XCOPY /Y ..\..\..\..\..\obj\windows\intern\soundsystem\dummy\*.lib ..\..\..\..\..\..\lib\windows\SoundSystem\lib\*.lib -ECHO Done -"/> + Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool @@ -60,11 +56,17 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug" - IntermediateDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug" + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -72,16 +74,17 @@ ECHO Done <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem;..\..\..\..\moto\include" + AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" + BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/DummySoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/" - ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/" - ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug\DummySoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> @@ -89,16 +92,12 @@ ECHO Done Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug\libDummySoundSystem.lib" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\debug\libDummySoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool - Name="VCPostBuildEventTool" - CommandLine="ECHO Copying lib -XCOPY /Y ..\..\..\..\..\obj\windows\intern\soundsystem\dummy\debug\*.lib ..\..\..\..\..\..\lib\windows\SoundSystem\lib\debug\*.lib -ECHO Done -"/> + Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool @@ -109,8 +108,119 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Release|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include" + PreprocessorDefinitions="WIN32,NDEBUG,_LIB" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\DummySoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libDummySoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Debug|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include" + PreprocessorDefinitions="WIN32,_DEBUG,_LIB" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug\DummySoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\dummy\mtdll\debug\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libDummySoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <Files> <Filter Name="Source Files" diff --git a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj index 83093403be6..11fe5315c45 100644 --- a/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj +++ b/intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding = "Windows-1252"?> +<?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.00" + Version="7.0" Name="OpenALSoundSystem" ProjectGUID="{213356A9-3A1F-41DA-9819-1297BCD17DEE}" SccProjectName="" @@ -12,9 +12,9 @@ </Platforms> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug" - IntermediateDirectory=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug" + Name="Blender Debug|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -22,16 +22,17 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include" + AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" + BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/OpenALSoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/" - ObjectFile=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/" - ProgramDataBaseFileName=".\..\..\..\..\obj\windows\intern\soundsystem\openal\debug/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug\OpenALSoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\debug\" + WarningLevel="2" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> @@ -39,16 +40,12 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug\libOpenALSoundSystem.lib" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\debug\libOpenALSoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool - Name="VCPostBuildEventTool" - CommandLine="ECHO Copying lib -XCOPY /Y ..\..\..\..\..\obj\windows\intern\soundsystem\openal\debug\*.lib ..\..\..\..\..\..\lib\windows\SoundSystem\lib\debug\*.lib -ECHO Done -"/> + Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool @@ -59,11 +56,17 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal" - IntermediateDirectory=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal" + Name="Blender Release|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -71,34 +74,82 @@ ECHO Done <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\intern;..\..\..\..\string;..\..\..\..\SoundSystem\sdl;..\..\..\..\SoundSystem;..\..\..\..\moto\include;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include" + AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/OpenALSoundSystem.pch" - AssemblerListingLocation=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/" - ObjectFile=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/" - ProgramDataBaseFileName=".\..\..\..\..\..\obj\windows\intern\soundsystem\openal/" - WarningLevel="1" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\OpenALSoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\libOpenALSoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Release|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include" + PreprocessorDefinitions="NDEBUG,WIN32,_LIB" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\OpenALSoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\" + WarningLevel="2" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\obj\windows\intern\soundsystem\openal\libOpenALSoundSystem.lib" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libOpenALSoundSystem.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool"/> <Tool - Name="VCPostBuildEventTool" - CommandLine="ECHO Copying lib -XCOPY /Y ..\..\..\..\..\obj\windows\intern\soundsystem\openal\*.lib ..\..\..\..\..\..\lib\windows\SoundSystem\lib\*.lib -ECHO Done -"/> + Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool @@ -109,8 +160,67 @@ ECHO Done Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="3DPlugin Debug|Win32" + OutputDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug" + IntermediateDirectory="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\sdl;..\..\..\intern;..\..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + DefaultCharIsUnsigned="TRUE" + UsePrecompiledHeader="2" + PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug\OpenALSoundSystem.pch" + AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug\" + ObjectFile="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug\" + ProgramDataBaseFileName="..\..\..\..\..\..\build\msvc_7\intern\soundsystem\openal\mtdll\debug\" + WarningLevel="2" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libOpenALSoundSystem.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <Files> <Filter Name="Source Files" |