From b7b1094b22f49c9ad9a4eab9ed59512963e116da Mon Sep 17 00:00:00 2001 From: driAn Date: Thu, 11 Sep 2008 18:53:38 +0000 Subject: [PATCH] official openal as default backend (again) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2525 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- ... => openal32_RemoveThisPartToUseOpenAL-Soft.dll} | Bin bin_win32/readme_OpenAL.txt | 7 +++++-- source/vcpp/buildEnv/ac.nsi | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) rename bin_win32/{openal32.dll => openal32_RemoveThisPartToUseOpenAL-Soft.dll} (100%) diff --git a/bin_win32/openal32.dll b/bin_win32/openal32_RemoveThisPartToUseOpenAL-Soft.dll similarity index 100% rename from bin_win32/openal32.dll rename to bin_win32/openal32_RemoveThisPartToUseOpenAL-Soft.dll diff --git a/bin_win32/readme_OpenAL.txt b/bin_win32/readme_OpenAL.txt index 4977df58..8a36f83c 100644 --- a/bin_win32/readme_OpenAL.txt +++ b/bin_win32/readme_OpenAL.txt @@ -1,5 +1,8 @@ +AssaultCube uses the official OpenAL implementation by default. +If you encounter any sound problems you can switch to OpenAL-Soft, +this can be done by renaming openal32_RemoveThisPartToUseOpenAL-Soft.dll +to openal32.dll + OpenAL-Soft is an OpenAL implementation licensed under the terms of the LGPL. Visit http://kcat.strangesoft.net/openal.html - - AssaultCube uses a customized version of OpenAL-Soft 1.5.304 \ No newline at end of file diff --git a/source/vcpp/buildEnv/ac.nsi b/source/vcpp/buildEnv/ac.nsi index 7afd43d7..9cd01321 100644 --- a/source/vcpp/buildEnv/ac.nsi +++ b/source/vcpp/buildEnv/ac.nsi @@ -110,6 +110,13 @@ Section "Visual C++ redistributable runtime" VCPP SectionEnd +Section "OpenAL 1.1 redistributable" OAL + + SectionIn RO + ExecWait '"$INSTDIR\bin\oalinst.exe -s"' + +SectionEnd + Section "Multiuser Support (recommended)" MULTIUSER ; configures the .bat file to store configs in the appdata directory @@ -162,6 +169,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${AC} "Installs the required AssaultCube core files" !insertmacro MUI_DESCRIPTION_TEXT ${VCPP} "Installs the runtime to make AssaultCube run on your computer" + !insertmacro MUI_DESCRIPTION_TEXT ${OAL} "Installs a sound library for 3D audio" !insertmacro MUI_DESCRIPTION_TEXT ${SHORTCUTS} "Creates shortcuts in your Startmenu" !insertmacro MUI_DESCRIPTION_TEXT ${MULTIUSER} "Configures AssaultCube to store its configuration in user-profiles"