This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 4fd0b1c11485c18fb1d7f17215cb7c6b1c883d99 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Tue Jan 28 01:00:30 2014 +0000 All: Change the OpenAL driver and device cvars to CVAR_ROM / Add the reference OpenAL dll's for windows --- MP/code/client/snd_openal.c | 13 ++++++++++--- MP/code/libs/win32/OpenAL32.dll | Bin 0 -> 402553 bytes MP/code/libs/win64/OpenAL64.dll | Bin 0 -> 417320 bytes SP/code/client/snd_openal.c | 12 +++++++++--- SP/code/libs/win32/OpenAL32.dll | Bin 0 -> 402553 bytes SP/code/libs/win64/OpenAL64.dll | Bin 0 -> 417320 bytes 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c index 60c3e62..f105852 100644 --- a/MP/code/client/snd_openal.c +++ b/MP/code/client/snd_openal.c @@ -2313,6 +2313,8 @@ static cvar_t *s_alCapture; #ifdef _WIN32 #define ALDRIVER_DEFAULT "OpenAL32.dll" +#elif defined(_WIN64) +#define ALDRIVER_DEFAULT "OpenAL64.dll" #elif defined(MACOS_X) #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" #elif defined(__OpenBSD__) @@ -2617,15 +2619,20 @@ qboolean S_AL_Init( soundInterface_t *si ) s_alRolloff = Cvar_Get( "s_alRolloff", "2", CVAR_CHEAT); s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_CHEAT); - s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH ); + s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM ); - s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH ); - s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH); + s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ROM ); + s_alDevice = Cvar_Get( "s_alDevice", "", CVAR_ROM ); // Load QAL if( !QAL_Init( s_alDriver->string ) ) { +#ifdef _WIN64 + s_alDriver = Cvar_Get( "s_alDriver", "OpenAL32.dll", CVAR_ROM ); // Try falling back to default name + if ( !QAL_Init( s_alDriver->string ) ) +#endif Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string ); + return qfalse; } diff --git a/MP/code/libs/win32/OpenAL32.dll b/MP/code/libs/win32/OpenAL32.dll new file mode 100755 index 0000000..71ced6a Binary files /dev/null and b/MP/code/libs/win32/OpenAL32.dll differ diff --git a/MP/code/libs/win64/OpenAL64.dll b/MP/code/libs/win64/OpenAL64.dll new file mode 100755 index 0000000..b47ff95 Binary files /dev/null and b/MP/code/libs/win64/OpenAL64.dll differ diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c index e101e6f..b5eae81 100644 --- a/SP/code/client/snd_openal.c +++ b/SP/code/client/snd_openal.c @@ -2352,6 +2352,8 @@ static cvar_t *s_alCapture; #ifdef _WIN32 #define ALDRIVER_DEFAULT "OpenAL32.dll" +#elif defined(_WIN64) +#define ALDRIVER_DEFAULT "OpenAL64.dll" #elif defined(MACOS_X) #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" #elif defined(__OpenBSD__) @@ -2656,14 +2658,18 @@ qboolean S_AL_Init( soundInterface_t *si ) s_alRolloff = Cvar_Get( "s_alRolloff", "1.3", CVAR_ARCHIVE); s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_ARCHIVE); - s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH ); + s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ROM ); - s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH ); - s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH); + s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ROM ); + s_alDevice = Cvar_Get( "s_alDevice", "", CVAR_ROM ); // Load QAL if( !QAL_Init( s_alDriver->string ) ) { +#ifdef _WIN64 + s_alDriver = Cvar_Get( "s_alDriver", "OpenAL32.dll", CVAR_ROM ); // Try falling back to default name + if ( !QAL_Init( s_alDriver->string ) ) +#endif Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string ); return qfalse; } diff --git a/SP/code/libs/win32/OpenAL32.dll b/SP/code/libs/win32/OpenAL32.dll new file mode 100755 index 0000000..71ced6a Binary files /dev/null and b/SP/code/libs/win32/OpenAL32.dll differ diff --git a/SP/code/libs/win64/OpenAL64.dll b/SP/code/libs/win64/OpenAL64.dll new file mode 100755 index 0000000..b47ff95 Binary files /dev/null and b/SP/code/libs/win64/OpenAL64.dll differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
