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 1d83b1c7ba0fcac92ff86ebc07339e65cdbf3d4d Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sun May 4 13:45:20 2014 +0000 All: Fix OpenAL fallback driver for Win64 --- MP/code/client/snd_openal.c | 6 ++++-- SP/code/client/snd_openal.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c index 04b3d99..668ddbb 100644 --- a/MP/code/client/snd_openal.c +++ b/MP/code/client/snd_openal.c @@ -2313,8 +2313,6 @@ 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__) @@ -2628,7 +2626,11 @@ qboolean S_AL_Init( soundInterface_t *si ) if( !QAL_Init( s_alDriver->string ) ) { Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string ); +#ifdef _WIN32 + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "OpenAL64.dll" ) ) { +#else if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) || !QAL_Init( ALDRIVER_DEFAULT ) ) { +#endif return qfalse; } } diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c index d186323..a888adf 100644 --- a/SP/code/client/snd_openal.c +++ b/SP/code/client/snd_openal.c @@ -2352,8 +2352,6 @@ 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__) @@ -2667,7 +2665,11 @@ qboolean S_AL_Init( soundInterface_t *si ) if( !QAL_Init( s_alDriver->string ) ) { Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string ); +#ifdef _WIN32 + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "OpenAL64.dll" ) ) { +#else if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) || !QAL_Init( ALDRIVER_DEFAULT ) ) { +#endif return qfalse; } } -- 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
