From acd02148d84cf33c06fadd33b3af9d7d44d5974a Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Wed, 5 Aug 2009 14:10:29 +0000
Subject: [PATCH] Update for new OpenAL windows library.

---
 CMakeLists.txt                                 |  2 +-
 config/win32-mingw-config.py                   |  2 +-
 config/win32-vc-config.py                      |  2 +-
 intern/SoundSystem/openal/SND_OpenALDevice.cpp | 12 +++---------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00d53282fed..dcb2f546bce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,7 @@ IF(WIN32)
   #SET(WITH_OPENAL ON)
   SET(OPENAL ${LIBDIR}/openal)
   SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-  SET(OPENAL_LIB openal_static)
+  SET(OPENAL_LIB wrap_oal)
   SET(OPENAL_LIBPATH ${OPENAL}/lib)
 
   IF(CMAKE_CL_64)
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index f2a336a72fa..5801df86c27 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -21,7 +21,7 @@ WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index c2f8e29e4c6..359f52e6bf8 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -22,7 +22,7 @@ WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index 424a05246ac..cfcdc45024f 100644
--- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp
+++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
@@ -372,9 +372,6 @@ SND_OpenALDevice::SND_OpenALDevice()
 	{
 #ifdef __APPLE__
 		ALenum alc_error = ALC_NO_ERROR;	// openal_2.12
-#elif defined(_WIN32)
-		// alcGetError has no arguments on windows
-		ALenum alc_error = alcGetError();       // openal_2.14+
 #else
 		ALenum alc_error = alcGetError(NULL);	// openal_2.14+
 #endif
@@ -410,9 +407,6 @@ void SND_OpenALDevice::UseCD(void) const
 
 void SND_OpenALDevice::MakeCurrent() const
 {
-#ifdef WIN32
-	alcMakeContextCurrent(m_context);
-#endif
 }
 
 
@@ -614,11 +608,11 @@ void SND_OpenALDevice::InitListener()
 	// have the same settings)
 	float lispos[3] = {0,0,0};
 	float lisvel[3] = {0,0,0};
-#ifdef WIN32
+/*#ifdef WIN32
 	float lisori[6] = {0,1,0,0,0,1};
-#else
+#else*/
 	float lisori[6] = {0,0,1,0,-1,0};
-#endif
+//#endif
 
 	alListenerfv(AL_POSITION, lispos);
 	alListenerfv(AL_VELOCITY, lisvel);