Mercurial > hg > openttd
changeset 12180:71a198100dd0 draft openal
Add support for building the OpenAL sound driver with MSVC.
author | Michael Lutz <michi@icosahedron.de> |
---|---|
date | Thu, 18 Jun 2009 16:27:01 +0200 |
parents | ce025491d1e5 |
children | |
files | projects/openttd_vs80.sln projects/openttd_vs80.vcproj projects/openttd_vs80.vcproj.in projects/openttd_vs80.vcproj.user projects/openttd_vs90.sln projects/openttd_vs90.vcproj projects/openttd_vs90.vcproj.in projects/openttd_vs90.vcproj.user src/sound/openal_s.cpp |
diffstat | 9 files changed, 1002 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.sln +++ b/projects/openttd_vs80.sln @@ -20,6 +20,8 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release (OpenAL)|Win32 = Release (OpenAL)|Win32 + Release (OpenAL)|x64 = Release (OpenAL)|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -28,6 +30,10 @@ {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|Win32.ActiveCfg = Release (OpenAL)|Win32 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|Win32.Build.0 = Release (OpenAL)|Win32 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|x64.ActiveCfg = Release (OpenAL)|x64 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|x64.Build.0 = Release (OpenAL)|x64 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64 @@ -36,6 +42,10 @@ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|Win32.ActiveCfg = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|Win32.Build.0 = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|x64.ActiveCfg = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|x64.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32 @@ -44,6 +54,10 @@ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|Win32.ActiveCfg = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|Win32.Build.0 = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|x64.ActiveCfg = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|x64.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -135,6 +135,119 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="3" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + OptimizeForWindows98="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="Debug|Win32" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" @@ -348,6 +461,120 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + OptimizeForWindows98="1" + TargetMachine="17" + /> + <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="Debug|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -3536,6 +3763,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release (OpenAL)|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" >
--- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -135,6 +135,119 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="3" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + OptimizeForWindows98="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="Debug|Win32" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" @@ -348,6 +461,120 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + OptimizeForWindows98="1" + TargetMachine="17" + /> + <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="Debug|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -469,6 +696,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release (OpenAL)|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" >
--- a/projects/openttd_vs80.vcproj.user +++ b/projects/openttd_vs80.vcproj.user @@ -13,6 +13,14 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + > + <DebugSettings + WorkingDirectory="..\bin" + CommandArguments="-s openal" + /> + </Configuration> + <Configuration Name="Debug|Win32" > <DebugSettings @@ -27,6 +35,14 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + > + <DebugSettings + WorkingDirectory="..\bin" + CommandArguments="-s openal" + /> + </Configuration> + <Configuration Name="Debug|x64" > <DebugSettings
--- a/projects/openttd_vs90.sln +++ b/projects/openttd_vs90.sln @@ -20,6 +20,8 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release (OpenAL)|Win32 = Release (OpenAL)|Win32 + Release (OpenAL)|x64 = Release (OpenAL)|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -28,6 +30,10 @@ {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|Win32.ActiveCfg = Release (OpenAL)|Win32 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|Win32.Build.0 = Release (OpenAL)|Win32 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|x64.ActiveCfg = Release (OpenAL)|x64 + {668328A0-B40E-4CDB-BD72-D0064424414A}.Release (OpenAL)|x64.Build.0 = Release (OpenAL)|x64 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64 @@ -36,6 +42,10 @@ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|Win32.ActiveCfg = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|Win32.Build.0 = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|x64.ActiveCfg = Debug|Win32 + {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release (OpenAL)|x64.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32 @@ -44,6 +54,10 @@ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|Win32.ActiveCfg = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|Win32.Build.0 = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|x64.ActiveCfg = Debug|Win32 + {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release (OpenAL)|x64.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -134,6 +134,117 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="3" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" @@ -345,6 +456,119 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + TargetMachine="17" + /> + <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="Debug|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -3533,6 +3757,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release (OpenAL)|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" >
--- a/projects/openttd_vs90.vcproj.in +++ b/projects/openttd_vs90.vcproj.in @@ -134,6 +134,117 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="3" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" @@ -345,6 +456,119 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT;WITH_OPENAL;CREATIVE_OAL_SDK" + StringPooling="true" + ExceptionHandling="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + DefaultCharIsUnsigned="true" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + AssemblerOutput="2" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)/" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CallingConvention="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1053" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib OpenAL32.lib" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="2" + StackReserveSize="1048576" + StackCommitSize="1048576" + OptimizeReferences="2" + TargetMachine="17" + /> + <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="Debug|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -466,6 +690,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release (OpenAL)|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" >
--- a/projects/openttd_vs90.vcproj.user +++ b/projects/openttd_vs90.vcproj.user @@ -13,6 +13,14 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|Win32" + > + <DebugSettings + WorkingDirectory="..\bin" + CommandArguments="-s openal" + /> + </Configuration> + <Configuration Name="Debug|Win32" > <DebugSettings @@ -27,6 +35,14 @@ /> </Configuration> <Configuration + Name="Release (OpenAL)|x64" + > + <DebugSettings + WorkingDirectory="..\bin" + CommandArguments="-s openal" + /> + </Configuration> + <Configuration Name="Debug|x64" > <DebugSettings
--- a/src/sound/openal_s.cpp +++ b/src/sound/openal_s.cpp @@ -9,8 +9,14 @@ #include "../thread.h" #include "../gfx_func.h" #include "openal_s.h" -#include <AL/al.h> -#include <AL/alc.h> +#ifdef CREATIVE_OAL_SDK + /* The Creative Labs OpenAL SDK has its headers not inside a subfolder. */ + #include <al.h> + #include <alc.h> +#else + #include <AL/al.h> + #include <AL/alc.h> +#endif #define NUM_BUFFERS 3