Mercurial > fife-parpg
changeset 214:a18f09b604f2
Added svn:eol-style on files that didn't already have that property.
Affected file types: c, cpp, h, txt, py and xml.
| author | cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Tue, 17 Mar 2009 21:24:54 +0000 |
| parents | b0c4e6e41659 |
| children | 5f5f8ca6db93 |
| files | build/win32/build_environments/code_blocks/engine_template.xml build/win32/build_environments/visual_studio_8/engine_template.xml build/win32/build_environments/visual_studio_8/unittest_template.xml build/win32/build_environments/visual_studio_9/engine_template.xml clients/rio_de_hola/gui/changes_require_restart.xml clients/rio_de_hola/gui/settings.xml clients/rio_de_hola/settings-dist.xml ext/openal-soft/Alc/bs2b.c |
| diffstat | 8 files changed, 910 insertions(+), 910 deletions(-) [+] |
line wrap: on
line diff
--- a/build/win32/build_environments/code_blocks/engine_template.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/build/win32/build_environments/code_blocks/engine_template.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,70 +1,70 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="6" /> - <Project> - <Option title="_fife.pyd" /> - <Option pch_mode="0" /> - <Option compiler="gcc" /> - <Build> - <Target title="default"> - <Option output="..\..\..\..\engine\swigwrappers\python\_fife.pyd" prefix_auto="0" extension_auto="0" /> - <Option type="3" /> - <Option compiler="gcc" /> - <Option createDefFile="1" /> - <Compiler> - <Add option="-DHAVE_OPENGL" /> - <Add option="-DHAVE_ZIP" /> - <Add option="-DLOG_ENABLED" /> - <Add directory="..\..\..\..\engine" /> - <Add directory="..\..\..\..\engine\core" /> - <Add directory="..\..\includes\mingw\boost_1_38_0" /> - <Add directory="..\..\includes\mingw\libguichan" /> - <Add directory="..\..\includes\mingw\libogg" /> - <Add directory="..\..\includes\mingw\libpng" /> - <Add directory="..\..\includes\mingw\libvorbis" /> - <Add directory="..\..\includes\mingw\openal" /> - <Add directory="..\..\includes\mingw\python25" /> - <Add directory="..\..\includes\mingw\sdl" /> - <Add directory="..\..\includes\mingw\sdl_image" /> - <Add directory="..\..\includes\mingw\sdl_ttf" /> - <Add directory="..\..\includes\mingw\zlib" /> - </Compiler> - <Linker> - <Add library="..\..\static_libs\mingw\libguichan_opengl.a" /> - <Add library="..\..\static_libs\mingw\libguichan_sdl.a" /> - <Add library="..\..\static_libs\mingw\libguichan.a" /> - <Add library="..\..\applications\mingw\lib\libmingw32.a" /> - <Add library="..\..\static_libs\mingw\libzlib.a" /> - <Add library="..\..\static_libs\mingw\libvorbis.a" /> - <Add library="..\..\static_libs\mingw\libogg.a" /> - <Add library="..\..\static_libs\mingw\libvorbisfile.a" /> - <Add library="..\..\static_libs\mingw\libpng.a" /> - <Add library="..\..\static_libs\mingw\SDL_image.lib" /> - <Add library="..\..\static_libs\mingw\libSDLmain.a" /> - <Add library="..\..\static_libs\mingw\libSDL.dll.a" /> - <Add library="..\..\static_libs\mingw\OpenAl32.lib" /> - <Add library="..\..\static_libs\mingw\SDL_ttf.lib" /> - <Add library="..\..\static_libs\mingw\libboost_filesystem.a" /> - <Add library="..\..\static_libs\mingw\libboost_regex.a" /> - <Add library="..\..\static_libs\mingw\libboost_system.a" /> - <Add library="..\..\applications\mingw\lib\libopengl32.a" /> - <Add library="..\..\applications\mingw\lib\libglu32.a" /> - <Add library="..\..\static_libs\mingw\python25\libpython25.a" /> - </Linker> - </Target> - </Build> - <VirtualTargets> - <Add alias="All" targets="default;" /> - </VirtualTargets> - <Compiler> - <Add option="-O3" /> - <Add option="-Wall" /> - </Compiler> -__FILE_INSERTION_POINT__ - <Extensions> - <code_completion /> - <envvars /> - <debugger /> - </Extensions> - </Project> -</CodeBlocks_project_file> +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="_fife.pyd" /> + <Option pch_mode="0" /> + <Option compiler="gcc" /> + <Build> + <Target title="default"> + <Option output="..\..\..\..\engine\swigwrappers\python\_fife.pyd" prefix_auto="0" extension_auto="0" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Option createDefFile="1" /> + <Compiler> + <Add option="-DHAVE_OPENGL" /> + <Add option="-DHAVE_ZIP" /> + <Add option="-DLOG_ENABLED" /> + <Add directory="..\..\..\..\engine" /> + <Add directory="..\..\..\..\engine\core" /> + <Add directory="..\..\includes\mingw\boost_1_38_0" /> + <Add directory="..\..\includes\mingw\libguichan" /> + <Add directory="..\..\includes\mingw\libogg" /> + <Add directory="..\..\includes\mingw\libpng" /> + <Add directory="..\..\includes\mingw\libvorbis" /> + <Add directory="..\..\includes\mingw\openal" /> + <Add directory="..\..\includes\mingw\python25" /> + <Add directory="..\..\includes\mingw\sdl" /> + <Add directory="..\..\includes\mingw\sdl_image" /> + <Add directory="..\..\includes\mingw\sdl_ttf" /> + <Add directory="..\..\includes\mingw\zlib" /> + </Compiler> + <Linker> + <Add library="..\..\static_libs\mingw\libguichan_opengl.a" /> + <Add library="..\..\static_libs\mingw\libguichan_sdl.a" /> + <Add library="..\..\static_libs\mingw\libguichan.a" /> + <Add library="..\..\applications\mingw\lib\libmingw32.a" /> + <Add library="..\..\static_libs\mingw\libzlib.a" /> + <Add library="..\..\static_libs\mingw\libvorbis.a" /> + <Add library="..\..\static_libs\mingw\libogg.a" /> + <Add library="..\..\static_libs\mingw\libvorbisfile.a" /> + <Add library="..\..\static_libs\mingw\libpng.a" /> + <Add library="..\..\static_libs\mingw\SDL_image.lib" /> + <Add library="..\..\static_libs\mingw\libSDLmain.a" /> + <Add library="..\..\static_libs\mingw\libSDL.dll.a" /> + <Add library="..\..\static_libs\mingw\OpenAl32.lib" /> + <Add library="..\..\static_libs\mingw\SDL_ttf.lib" /> + <Add library="..\..\static_libs\mingw\libboost_filesystem.a" /> + <Add library="..\..\static_libs\mingw\libboost_regex.a" /> + <Add library="..\..\static_libs\mingw\libboost_system.a" /> + <Add library="..\..\applications\mingw\lib\libopengl32.a" /> + <Add library="..\..\applications\mingw\lib\libglu32.a" /> + <Add library="..\..\static_libs\mingw\python25\libpython25.a" /> + </Linker> + </Target> + </Build> + <VirtualTargets> + <Add alias="All" targets="default;" /> + </VirtualTargets> + <Compiler> + <Add option="-O3" /> + <Add option="-Wall" /> + </Compiler> +__FILE_INSERTION_POINT__ + <Extensions> + <code_completion /> + <envvars /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file>
--- a/build/win32/build_environments/visual_studio_8/engine_template.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/build/win32/build_environments/visual_studio_8/engine_template.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,189 +1,189 @@ -<?xml version="1.0" encoding="windows-1252"?> -<VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="libfife" ProjectGUID="{96025707-5759-400D-80E5-A1E94C8A79A2}" RootNamespace="fife_trunk_core" Keyword="Win32Proj"> - <Platforms> - <Platform Name="Win32"/> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\..\engine\swigwrappers\python" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - MinimalRebuild="true" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLinkerTool" - AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" - OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" - IgnoreDefaultLibraryNames="libcmt.lib" - GenerateDebugInformation="true" - /> - <Tool Name="VCALinkTool"/> - <Tool Name="VCManifestTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCAppVerifierTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - <!-- Static Builds used for unit testing solution --> - <Configuration - Name="Debug_static|Win32" - OutputDirectory="..\..\static_libs\msvc2005" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4250;4290" - /> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName)_d.lib"/> - <Tool Name="VCALinkTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - <Configuration - Name="Release_static|Win32" - OutputDirectory="..\..\static_libs\msvc2005" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLibrarianTool"/> - <Tool Name="VCALinkTool"/> - <Tool Name="VCManifestTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCAppVerifierTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\..\engine\swigwrappers\python" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLinkerTool" - AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" - OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" - IgnoreDefaultLibraryNames="libcmt.lib" - /> - <Tool Name="VCALinkTool"/> - <Tool Name="VCManifestTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCAppVerifierTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> -__FILE_INSERTION_POINT__ - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="windows-1252"?> +<VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="libfife" ProjectGUID="{96025707-5759-400D-80E5-A1E94C8A79A2}" RootNamespace="fife_trunk_core" Keyword="Win32Proj"> + <Platforms> + <Platform Name="Win32"/> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="..\..\..\..\engine\swigwrappers\python" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + MinimalRebuild="true" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLinkerTool" + AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" + OutputFile="$(OutDir)\_fife.pyd" + AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" + IgnoreDefaultLibraryNames="libcmt.lib" + GenerateDebugInformation="true" + /> + <Tool Name="VCALinkTool"/> + <Tool Name="VCManifestTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCAppVerifierTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + <!-- Static Builds used for unit testing solution --> + <Configuration + Name="Debug_static|Win32" + OutputDirectory="..\..\static_libs\msvc2005" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + DisableSpecificWarnings="4250;4290" + /> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName)_d.lib"/> + <Tool Name="VCALinkTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + <Configuration + Name="Release_static|Win32" + OutputDirectory="..\..\static_libs\msvc2005" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLibrarianTool"/> + <Tool Name="VCALinkTool"/> + <Tool Name="VCManifestTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCAppVerifierTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="..\..\..\..\engine\swigwrappers\python" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2005\libguichan;..\..\includes\msvc2005\boost_1_38_0;..\..\includes\msvc2005\openal;..\..\includes\msvc2005\sdl;..\..\includes\msvc2005\zlib;..\..\includes\msvc2005\libvorbis;..\..\includes\msvc2005\libpng;..\..\includes\msvc2005\libogg;..\..\includes\msvc2005\python25;..\..\includes\msvc2005\sdl_image;..\..\includes\msvc2005\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLinkerTool" + AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" + OutputFile="$(OutDir)\_fife.pyd" + AdditionalLibraryDirectories="..\..\static_libs\msvc2005;..\..\static_libs\msvc2005\python25" + IgnoreDefaultLibraryNames="libcmt.lib" + /> + <Tool Name="VCALinkTool"/> + <Tool Name="VCManifestTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCAppVerifierTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> +__FILE_INSERTION_POINT__ + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- a/build/win32/build_environments/visual_studio_8/unittest_template.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/build/win32/build_environments/visual_studio_8/unittest_template.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,69 +1,69 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="__INSERT_NAME_HERE__" - ProjectGUID="__INSERT_GUID_HERE__" - RootNamespace="__INSERT_NAME_HERE__" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration Name="Debug_static|Win32" OutputDirectory="../../../../../tests/core_tests/" IntermediateDirectory="$(ConfigurationName)/$(ProjectName)" ConfigurationType="1" CharacterSet="1"> - <Tool Name="VCPreBuildEventTool"/> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4"/> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLinkerTool" LinkIncremental="1" AdditionalDependencies="libfife_d.lib UnitTest++.lib guichan_opengld.lib guichan_sdld.lib guichand.lib ogg_static_d.lib OpenAL32.lib sdl.lib SDL_image.lib SDL_ttf.lib vorbis_static_d.lib vorbisfile_static_d.lib libpng.lib zlib.lib OpenGL32.lib GLU32.lib" AdditionalLibraryDirectories="..\..\..\static_libs\msvc2005" GenerateDebugInformation="true" SubSystem="1" TargetMachine="1"/> - <Tool Name="VCALinkTool"/> - <Tool Name="VCManifestTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCAppVerifierTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - <Configuration Name="Release_static|Win32" OutputDirectory="../../../../../tests/core_tests/" IntermediateDirectory="$(ConfigurationName)/$(ProjectName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1"> - <Tool Name="VCPreBuildEventTool"/> - <Tool Name="VCCustomBuildTool"/> - <Tool Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool Name="VCMIDLTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python25;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_CONSOLE" MinimalRebuild="true" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3"/> - <Tool Name="VCManagedResourceCompilerTool"/> - <Tool Name="VCResourceCompilerTool"/> - <Tool Name="VCPreLinkEventTool"/> - <Tool Name="VCLinkerTool" LinkIncremental="1" AdditionalDependencies="libfife.lib UnitTest++.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib OpenAL32.lib sdl.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib OpenGL32.lib GLU32.lib" AdditionalLibraryDirectories="..\..\..\static_libs\msvc2005" SubSystem="1" TargetMachine="1"/> - <Tool Name="VCALinkTool"/> - <Tool Name="VCManifestTool"/> - <Tool Name="VCXDCMakeTool"/> - <Tool Name="VCBscMakeTool"/> - <Tool Name="VCFxCopTool"/> - <Tool Name="VCAppVerifierTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool Name="VCPostBuildEventTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\..\..\..\..\tests\core_tests\__INSERT_FILENAME_HERE__.cpp" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="__INSERT_NAME_HERE__" + ProjectGUID="__INSERT_GUID_HERE__" + RootNamespace="__INSERT_NAME_HERE__" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration Name="Debug_static|Win32" OutputDirectory="../../../../../tests/core_tests/" IntermediateDirectory="$(ConfigurationName)/$(ProjectName)" ConfigurationType="1" CharacterSet="1"> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4"/> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLinkerTool" LinkIncremental="1" AdditionalDependencies="libfife_d.lib UnitTest++.lib guichan_opengld.lib guichan_sdld.lib guichand.lib ogg_static_d.lib OpenAL32.lib sdl.lib SDL_image.lib SDL_ttf.lib vorbis_static_d.lib vorbisfile_static_d.lib libpng.lib zlib.lib OpenGL32.lib GLU32.lib" AdditionalLibraryDirectories="..\..\..\static_libs\msvc2005" GenerateDebugInformation="true" SubSystem="1" TargetMachine="1"/> + <Tool Name="VCALinkTool"/> + <Tool Name="VCManifestTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCAppVerifierTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + <Configuration Name="Release_static|Win32" OutputDirectory="../../../../../tests/core_tests/" IntermediateDirectory="$(ConfigurationName)/$(ProjectName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1"> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebServiceProxyGeneratorTool"/> + <Tool Name="VCMIDLTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\..\engine;..\..\..\..\..\engine\core;..\includes;..\..\..\includes\msvc2005\libguichan;..\..\..\includes\msvc2005\unittest++;..\..\..\includes\msvc2005\libogg;..\..\..\includes\msvc2005\openal-soft;..\..\..\includes\msvc2005\sdl;..\..\..\includes\msvc2005\sdl_image;..\..\..\includes\msvc2005\sdl_ttf;..\..\..\includes\msvc2005\zlib;..\..\..\includes\msvc2005\libvorbis;..\..\..\includes\msvc2005\libpng;..\..\..\includes\msvc2005\python25;..\..\..\includes\msvc2005\boost_1_38_0" PreprocessorDefinitions="WIN32;_CONSOLE" MinimalRebuild="true" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3"/> + <Tool Name="VCManagedResourceCompilerTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCLinkerTool" LinkIncremental="1" AdditionalDependencies="libfife.lib UnitTest++.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib OpenAL32.lib sdl.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib OpenGL32.lib GLU32.lib" AdditionalLibraryDirectories="..\..\..\static_libs\msvc2005" SubSystem="1" TargetMachine="1"/> + <Tool Name="VCALinkTool"/> + <Tool Name="VCManifestTool"/> + <Tool Name="VCXDCMakeTool"/> + <Tool Name="VCBscMakeTool"/> + <Tool Name="VCFxCopTool"/> + <Tool Name="VCAppVerifierTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool Name="VCPostBuildEventTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\..\..\..\tests\core_tests\__INSERT_FILENAME_HERE__.cpp" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- a/build/win32/build_environments/visual_studio_9/engine_template.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/build/win32/build_environments/visual_studio_9/engine_template.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,316 +1,316 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="libfife" - ProjectGUID="{96025707-5759-400D-80E5-A1E94C8A79A2}" - RootNamespace="fife_trunk_core" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\..\engine\swigwrappers\python" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - MinimalRebuild="true" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" - OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" - IgnoreDefaultLibraryNames="libcmt.lib" - GenerateDebugInformation="true" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="cd ..\..\
update_dlls_msvc2008.bat" - /> - </Configuration> - <Configuration - Name="Debug_static|Win32" - OutputDirectory="..\..\static_libs\msvc2008" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4250;4290" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName)_d.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release_static|Win32" - OutputDirectory="..\..\static_libs\msvc2008" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - WholeProgramOptimization="True" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\..\engine\swigwrappers\python" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - - <Tool - Name="VCPreBuildEventTool" - CommandLine="cd ..\..\
update_project_files.bat" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="3" - WholeProgramOptimization="True" - AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4250;4290" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" - OutputFile="$(OutDir)\_fife.pyd" - AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" - IgnoreDefaultLibraryNames="libcmt.lib" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="cd ..\..\
update_dlls_msvc2008.bat" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> -__FILE_INSERTION_POINT__ - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="libfife" + ProjectGUID="{96025707-5759-400D-80E5-A1E94C8A79A2}" + RootNamespace="fife_trunk_core" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="..\..\..\..\engine\swigwrappers\python" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + MinimalRebuild="true" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" + OutputFile="$(OutDir)\_fife.pyd" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" + IgnoreDefaultLibraryNames="libcmt.lib" + GenerateDebugInformation="true" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="cd ..\..\
update_dlls_msvc2008.bat" + /> + </Configuration> + <Configuration + Name="Debug_static|Win32" + OutputDirectory="..\..\static_libs\msvc2008" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + DisableSpecificWarnings="4250;4290" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName)_d.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release_static|Win32" + OutputDirectory="..\..\static_libs\msvc2008" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + WholeProgramOptimization="True" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="..\..\..\..\engine\swigwrappers\python" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + + <Tool + Name="VCPreBuildEventTool" + CommandLine="cd ..\..\
update_project_files.bat" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + WholeProgramOptimization="True" + AdditionalIncludeDirectories="..\..\..\..\engine;..\..\..\..\engine\core;..\..\includes\msvc;..\..\includes\msvc2008\libguichan;..\..\includes\msvc2008\boost_1_38_0;..\..\includes\msvc2008\openal;..\..\includes\msvc2008\sdl;..\..\includes\msvc2008\zlib;..\..\includes\msvc2008\libvorbis;..\..\includes\msvc2008\libpng;..\..\includes\msvc2008\libogg;..\..\includes\msvc2008\python25;..\..\includes\msvc2008\sdl_image;..\..\includes\msvc2008\sdl_ttf" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_OPENGL;HAVE_ZIP;LOG_ENABLED;WIN32_LEAN_AND_MEAN;NOMINMAX;M_SQRT2=1.41421356237309504880" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4250;4290" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="glu32.lib guichan_opengl.lib guichan_sdl.lib guichan.lib ogg_static.lib openal32.lib opengl32.lib sdl.lib sdlmain.lib SDL_image.lib SDL_ttf.lib vorbis_static.lib vorbisfile_static.lib libpng.lib zlib.lib" + OutputFile="$(OutDir)\_fife.pyd" + AdditionalLibraryDirectories="..\..\static_libs\msvc2008;..\..\static_libs\msvc2008\python25" + IgnoreDefaultLibraryNames="libcmt.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="cd ..\..\
update_dlls_msvc2008.bat" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> +__FILE_INSERTION_POINT__ + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- a/clients/rio_de_hola/gui/changes_require_restart.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/clients/rio_de_hola/gui/changes_require_restart.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,7 +1,7 @@ -<Window title="Changes require restart"> - <Label text="Some of your changes require you to restart Rio de hola." /> - <HBox> - <Spacer /> - <Button name="closeButton" text="Ok" /> - </HBox> -</Window> +<Window title="Changes require restart"> + <Label text="Some of your changes require you to restart Rio de hola." /> + <HBox> + <Spacer /> + <Button name="closeButton" text="Ok" /> + </HBox> +</Window>
--- a/clients/rio_de_hola/gui/settings.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/clients/rio_de_hola/gui/settings.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,21 +1,21 @@ -<Window name="Settings" title="Settings"> - <Label text="Rio de hola Settings menu!" /> - <HBox> - <VBox> - <Label text="Resolution:" /> - <Label text="Renderer:" /> - </VBox> - <VBox> - <DropDown name="screen_resolution" min_size="120,0" /> - <DropDown name="render_backend" min_size="120,0" /> - </VBox> - </HBox> - <CheckBox name="enable_fullscreen" text="Use the full screen mode" /> - <CheckBox name="enable_sound" text="Enable sound" /> - <HBox> - <Spacer /> - <Button name="cancelButton" text="Cancel" /> - <Button name="okButton" text="Ok" /> - <Button name="defaultButton" text="Defaults" /> - </HBox> -</Window> +<Window name="Settings" title="Settings"> + <Label text="Rio de hola Settings menu!" /> + <HBox> + <VBox> + <Label text="Resolution:" /> + <Label text="Renderer:" /> + </VBox> + <VBox> + <DropDown name="screen_resolution" min_size="120,0" /> + <DropDown name="render_backend" min_size="120,0" /> + </VBox> + </HBox> + <CheckBox name="enable_fullscreen" text="Use the full screen mode" /> + <CheckBox name="enable_sound" text="Enable sound" /> + <HBox> + <Spacer /> + <Button name="cancelButton" text="Cancel" /> + <Button name="okButton" text="Ok" /> + <Button name="defaultButton" text="Defaults" /> + </HBox> +</Window>
--- a/clients/rio_de_hola/settings-dist.xml Mon Mar 16 15:54:14 2009 +0000 +++ b/clients/rio_de_hola/settings-dist.xml Tue Mar 17 21:24:54 2009 +0000 @@ -1,35 +1,35 @@ -<Settings> - <FullScreen> 0 </FullScreen> - <PlaySounds> 1 </PlaySounds> - <RenderBackend> OpenGL </RenderBackend> - <ScreenWidth> 1024 </ScreenWidth> - <ScreenHeight> 768 </ScreenHeight> - <BitsPerPixel> 0 </BitsPerPixel> - <InitialVolume> 5.0 </InitialVolume> - <SDLRemoveFakeAlpha> 1 </SDLRemoveFakeAlpha> - <WindowTitle> FIFE - Rio de hola </WindowTitle> - <WindowIcon>gui/icons/boy.png</WindowIcon> - - <MapFile> maps/shrine.xml </MapFile> - <Font> fonts/samanata.ttf </Font> - <FontGlyphs> abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\"</FontGlyphs> - <LogModules> controller </LogModules> - <PychanDebug> False </PychanDebug> - <LogToPrompt> 1 </LogToPrompt> - <LogToFile> 0 </LogToFile> - <UsePsyco> False </UsePsyco> - <ProfilingOn> False </ProfilingOn> - <ImageChunkSize> 256 </ImageChunkSize> - - <CoordinateLayerName> TechdemoMapTileLayer </CoordinateLayerName> - <QuadTreeLayerName> <!--TechdemoMapObjectLayer--> </QuadTreeLayerName> - - <heroTexts> I wonder when the guys will \n get this world ready for me ; Bring it on baby, \n I'm ready for action! ; humm di dum.... </heroTexts> - <girlTexts> Why I am running? Haven't you heard \n that the bees are coming?! ; Heeelp!!! The bees are going to get us! </girlTexts> - <beekeeperTexts> Some idiot has grown mutated bees around here ; Want to take a look at my farm? ; Did you know that I actually cannot do anything \n else than stand still and greet everybody? </beekeeperTexts> - -<!-- Test Settings --> - <TestCameraPlacement> 0 </TestCameraPlacement> - <TestRotationLayerName> TechdemoMapObjectLayer <!-- TechdemoMapTileLayer --> </TestRotationLayerName> - <TestAgentSpeed> 0.5 </TestAgentSpeed> -</Settings> +<Settings> + <FullScreen> 0 </FullScreen> + <PlaySounds> 1 </PlaySounds> + <RenderBackend> OpenGL </RenderBackend> + <ScreenWidth> 1024 </ScreenWidth> + <ScreenHeight> 768 </ScreenHeight> + <BitsPerPixel> 0 </BitsPerPixel> + <InitialVolume> 5.0 </InitialVolume> + <SDLRemoveFakeAlpha> 1 </SDLRemoveFakeAlpha> + <WindowTitle> FIFE - Rio de hola </WindowTitle> + <WindowIcon>gui/icons/boy.png</WindowIcon> + + <MapFile> maps/shrine.xml </MapFile> + <Font> fonts/samanata.ttf </Font> + <FontGlyphs> abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\"</FontGlyphs> + <LogModules> controller </LogModules> + <PychanDebug> False </PychanDebug> + <LogToPrompt> 1 </LogToPrompt> + <LogToFile> 0 </LogToFile> + <UsePsyco> False </UsePsyco> + <ProfilingOn> False </ProfilingOn> + <ImageChunkSize> 256 </ImageChunkSize> + + <CoordinateLayerName> TechdemoMapTileLayer </CoordinateLayerName> + <QuadTreeLayerName> <!--TechdemoMapObjectLayer--> </QuadTreeLayerName> + + <heroTexts> I wonder when the guys will \n get this world ready for me ; Bring it on baby, \n I'm ready for action! ; humm di dum.... </heroTexts> + <girlTexts> Why I am running? Haven't you heard \n that the bees are coming?! ; Heeelp!!! The bees are going to get us! </girlTexts> + <beekeeperTexts> Some idiot has grown mutated bees around here ; Want to take a look at my farm? ; Did you know that I actually cannot do anything \n else than stand still and greet everybody? </beekeeperTexts> + +<!-- Test Settings --> + <TestCameraPlacement> 0 </TestCameraPlacement> + <TestRotationLayerName> TechdemoMapObjectLayer <!-- TechdemoMapTileLayer --> </TestRotationLayerName> + <TestAgentSpeed> 0.5 </TestAgentSpeed> +</Settings>
--- a/ext/openal-soft/Alc/bs2b.c Mon Mar 16 15:54:14 2009 +0000 +++ b/ext/openal-soft/Alc/bs2b.c Tue Mar 17 21:24:54 2009 +0000 @@ -1,203 +1,203 @@ -/*- - * Copyright (c) 2005 Boris Mikhaylov - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "config.h" - -#include <math.h> - -#include "bs2b.h" - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -/* Single pole IIR filter. - * O[n] = a0*I[n] + a1*I[n-1] + b1*O[n-1] - */ - -/* Lowpass filter */ -#define lo_filter(in, out_1) (bs2b->a0_lo*(in) + bs2b->b1_lo*(out_1)) - -/* Highboost filter */ -#define hi_filter(in, in_1, out_1) (bs2b->a0_hi*(in) + bs2b->a1_hi*(in_1) + bs2b->b1_hi*(out_1)) - -/* Set up all data. */ -static void init(struct bs2b *bs2b) -{ - double Fc_lo, Fc_hi; - double G_lo, G_hi; - double x; - - if ((bs2b->srate > 192000) || (bs2b->srate < 2000)) - bs2b->srate = BS2B_DEFAULT_SRATE; - - switch(bs2b->level) - { - case BS2B_LOW_CLEVEL: /* Low crossfeed level */ - Fc_lo = 360.0; - Fc_hi = 501.0; - G_lo = 0.398107170553497; - G_hi = 0.205671765275719; - break; - - case BS2B_MIDDLE_CLEVEL: /* Middle crossfeed level */ - Fc_lo = 500.0; - Fc_hi = 711.0; - G_lo = 0.459726988530872; - G_hi = 0.228208484414988; - break; - - case BS2B_HIGH_CLEVEL: /* High crossfeed level (virtual speakers are closer to itself) */ - Fc_lo = 700.0; - Fc_hi = 1021.0; - G_lo = 0.530884444230988; - G_hi = 0.250105790667544; - break; - - case BS2B_LOW_ECLEVEL: /* Low easy crossfeed level */ - Fc_lo = 360.0; - Fc_hi = 494.0; - G_lo = 0.316227766016838; - G_hi = 0.168236228897329; - break; - - case BS2B_MIDDLE_ECLEVEL: /* Middle easy crossfeed level */ - Fc_lo = 500.0; - Fc_hi = 689.0; - G_lo = 0.354813389233575; - G_hi = 0.187169483835901; - break; - - default: /* High easy crossfeed level */ - bs2b->level = BS2B_HIGH_ECLEVEL; - - Fc_lo = 700.0; - Fc_hi = 975.0; - G_lo = 0.398107170553497; - G_hi = 0.205671765275719; - break; - } /* switch */ - - /* $fc = $Fc / $s; - * $d = 1 / 2 / pi / $fc; - * $x = exp(-1 / $d); - */ - - x = exp(-2.0 * M_PI * Fc_lo / bs2b->srate); - bs2b->b1_lo = x; - bs2b->a0_lo = G_lo * (1.0 - x); - - x = exp(-2.0 * M_PI * Fc_hi / bs2b->srate); - bs2b->b1_hi = x; - bs2b->a0_hi = 1.0 - G_hi * (1.0 - x); - bs2b->a1_hi = -x; - - bs2b->gain = 1.0 / (1.0 - G_hi + G_lo); - - bs2b_clear(bs2b); -} /* init */ - -/* Exported functions. - * See descriptions in "bs2b.h" - */ - -void bs2b_set_level(struct bs2b *bs2b, int level) -{ - if(level == bs2b->level) - return; - bs2b->level = level; - init(bs2b); -} /* bs2b_set_level */ - -int bs2b_get_level(struct bs2b *bs2b) -{ - return bs2b->level; -} /* bs2b_get_level */ - -void bs2b_set_srate(struct bs2b *bs2b, int srate) -{ - if (srate == bs2b->srate) - return; - bs2b->srate = srate; - init(bs2b); -} /* bs2b_set_srate */ - -int bs2b_get_srate(struct bs2b *bs2b) -{ - return bs2b->srate; -} /* bs2b_get_srate */ - -void bs2b_clear(struct bs2b *bs2b) -{ - int loopv = sizeof(bs2b->last_sample); - - while (loopv) - { - ((char *)&bs2b->last_sample)[--loopv] = 0; - } -} /* bs2b_clear */ - -int bs2b_is_clear(struct bs2b *bs2b) -{ - int loopv = sizeof(bs2b->last_sample); - - while (loopv) - { - if (((char *)&bs2b->last_sample)[--loopv] != 0) - return 0; - } - return 1; -} /* bs2b_is_clear */ - -void bs2b_cross_feed(struct bs2b *bs2b, float *sample) -{ - /* Lowpass filter */ - bs2b->last_sample.lo[0] = lo_filter(sample[0], bs2b->last_sample.lo[0]); - bs2b->last_sample.lo[1] = lo_filter(sample[1], bs2b->last_sample.lo[1]); - - /* Highboost filter */ - bs2b->last_sample.hi[0] = hi_filter(sample[0], bs2b->last_sample.asis[0], bs2b->last_sample.hi[0]); - bs2b->last_sample.hi[1] = hi_filter(sample[1], bs2b->last_sample.asis[1], bs2b->last_sample.hi[1]); - bs2b->last_sample.asis[0] = sample[0]; - bs2b->last_sample.asis[1] = sample[1]; - - /* Crossfeed */ - sample[0] = bs2b->last_sample.hi[0] + bs2b->last_sample.lo[1]; - sample[1] = bs2b->last_sample.hi[1] + bs2b->last_sample.lo[0]; - - /* Bass boost cause allpass attenuation */ - sample[0] *= bs2b->gain; - sample[1] *= bs2b->gain; - - /* Clipping of overloaded samples */ -#if 0 - if (sample[0] > 1.0) - sample[0] = 1.0; - if (sample[0] < -1.0) - sample[0] = -1.0; - if (sample[1] > 1.0) - sample[1] = 1.0; - if (sample[1] < -1.0) - sample[1] = -1.0; -#endif -} /* bs2b_cross_feed */ +/*- + * Copyright (c) 2005 Boris Mikhaylov + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "config.h" + +#include <math.h> + +#include "bs2b.h" + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + +/* Single pole IIR filter. + * O[n] = a0*I[n] + a1*I[n-1] + b1*O[n-1] + */ + +/* Lowpass filter */ +#define lo_filter(in, out_1) (bs2b->a0_lo*(in) + bs2b->b1_lo*(out_1)) + +/* Highboost filter */ +#define hi_filter(in, in_1, out_1) (bs2b->a0_hi*(in) + bs2b->a1_hi*(in_1) + bs2b->b1_hi*(out_1)) + +/* Set up all data. */ +static void init(struct bs2b *bs2b) +{ + double Fc_lo, Fc_hi; + double G_lo, G_hi; + double x; + + if ((bs2b->srate > 192000) || (bs2b->srate < 2000)) + bs2b->srate = BS2B_DEFAULT_SRATE; + + switch(bs2b->level) + { + case BS2B_LOW_CLEVEL: /* Low crossfeed level */ + Fc_lo = 360.0; + Fc_hi = 501.0; + G_lo = 0.398107170553497; + G_hi = 0.205671765275719; + break; + + case BS2B_MIDDLE_CLEVEL: /* Middle crossfeed level */ + Fc_lo = 500.0; + Fc_hi = 711.0; + G_lo = 0.459726988530872; + G_hi = 0.228208484414988; + break; + + case BS2B_HIGH_CLEVEL: /* High crossfeed level (virtual speakers are closer to itself) */ + Fc_lo = 700.0; + Fc_hi = 1021.0; + G_lo = 0.530884444230988; + G_hi = 0.250105790667544; + break; + + case BS2B_LOW_ECLEVEL: /* Low easy crossfeed level */ + Fc_lo = 360.0; + Fc_hi = 494.0; + G_lo = 0.316227766016838; + G_hi = 0.168236228897329; + break; + + case BS2B_MIDDLE_ECLEVEL: /* Middle easy crossfeed level */ + Fc_lo = 500.0; + Fc_hi = 689.0; + G_lo = 0.354813389233575; + G_hi = 0.187169483835901; + break; + + default: /* High easy crossfeed level */ + bs2b->level = BS2B_HIGH_ECLEVEL; + + Fc_lo = 700.0; + Fc_hi = 975.0; + G_lo = 0.398107170553497; + G_hi = 0.205671765275719; + break; + } /* switch */ + + /* $fc = $Fc / $s; + * $d = 1 / 2 / pi / $fc; + * $x = exp(-1 / $d); + */ + + x = exp(-2.0 * M_PI * Fc_lo / bs2b->srate); + bs2b->b1_lo = x; + bs2b->a0_lo = G_lo * (1.0 - x); + + x = exp(-2.0 * M_PI * Fc_hi / bs2b->srate); + bs2b->b1_hi = x; + bs2b->a0_hi = 1.0 - G_hi * (1.0 - x); + bs2b->a1_hi = -x; + + bs2b->gain = 1.0 / (1.0 - G_hi + G_lo); + + bs2b_clear(bs2b); +} /* init */ + +/* Exported functions. + * See descriptions in "bs2b.h" + */ + +void bs2b_set_level(struct bs2b *bs2b, int level) +{ + if(level == bs2b->level) + return; + bs2b->level = level; + init(bs2b); +} /* bs2b_set_level */ + +int bs2b_get_level(struct bs2b *bs2b) +{ + return bs2b->level; +} /* bs2b_get_level */ + +void bs2b_set_srate(struct bs2b *bs2b, int srate) +{ + if (srate == bs2b->srate) + return; + bs2b->srate = srate; + init(bs2b); +} /* bs2b_set_srate */ + +int bs2b_get_srate(struct bs2b *bs2b) +{ + return bs2b->srate; +} /* bs2b_get_srate */ + +void bs2b_clear(struct bs2b *bs2b) +{ + int loopv = sizeof(bs2b->last_sample); + + while (loopv) + { + ((char *)&bs2b->last_sample)[--loopv] = 0; + } +} /* bs2b_clear */ + +int bs2b_is_clear(struct bs2b *bs2b) +{ + int loopv = sizeof(bs2b->last_sample); + + while (loopv) + { + if (((char *)&bs2b->last_sample)[--loopv] != 0) + return 0; + } + return 1; +} /* bs2b_is_clear */ + +void bs2b_cross_feed(struct bs2b *bs2b, float *sample) +{ + /* Lowpass filter */ + bs2b->last_sample.lo[0] = lo_filter(sample[0], bs2b->last_sample.lo[0]); + bs2b->last_sample.lo[1] = lo_filter(sample[1], bs2b->last_sample.lo[1]); + + /* Highboost filter */ + bs2b->last_sample.hi[0] = hi_filter(sample[0], bs2b->last_sample.asis[0], bs2b->last_sample.hi[0]); + bs2b->last_sample.hi[1] = hi_filter(sample[1], bs2b->last_sample.asis[1], bs2b->last_sample.hi[1]); + bs2b->last_sample.asis[0] = sample[0]; + bs2b->last_sample.asis[1] = sample[1]; + + /* Crossfeed */ + sample[0] = bs2b->last_sample.hi[0] + bs2b->last_sample.lo[1]; + sample[1] = bs2b->last_sample.hi[1] + bs2b->last_sample.lo[0]; + + /* Bass boost cause allpass attenuation */ + sample[0] *= bs2b->gain; + sample[1] *= bs2b->gain; + + /* Clipping of overloaded samples */ +#if 0 + if (sample[0] > 1.0) + sample[0] = 1.0; + if (sample[0] < -1.0) + sample[0] = -1.0; + if (sample[1] > 1.0) + sample[1] = 1.0; + if (sample[1] < -1.0) + sample[1] = -1.0; +#endif +} /* bs2b_cross_feed */