Update for new OpenAL windows library.
authorJoerg Mueller <nexyon@gmail.com>
Wed, 5 Aug 2009 14:10:29 +0000 (14:10 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Wed, 5 Aug 2009 14:10:29 +0000 (14:10 +0000)
CMakeLists.txt
config/win32-mingw-config.py
config/win32-vc-config.py
intern/SoundSystem/openal/SND_OpenALDevice.cpp

index 00d53282fed4dc1b724d2c64318f28f6f7bf8f8b..dcb2f546bce7f718fd6aebc4459345d8e3ff4615 100644 (file)
@@ -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)
index f2a336a72fa9c4f122fc9d18531274257d661574..5801df86c2795e3557b11528afb64897b4935f87 100644 (file)
@@ -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'
index c2f8e29e4c663cbecbd50b02f230013d212639c6..359f52e6bf836461882bb37163bb4d1f324152b7 100644 (file)
@@ -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'
index 424a05246aca44c77887daa2804a521a0f9ac332..cfcdc45024fb5fc558301069d2a36152a4b76ea3 100644 (file)
@@ -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);