[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22236] trunk/blender: Update for new OpenAL windows library.

Jörg Müller nexyon at gmail.com
Wed Aug 5 16:10:29 CEST 2009


Revision: 22236
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22236
Author:   nexyon
Date:     2009-08-05 16:10:29 +0200 (Wed, 05 Aug 2009)

Log Message:
-----------
Update for new OpenAL windows library.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/config/win32-vc-config.py
    trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2009-08-05 13:53:05 UTC (rev 22235)
+++ trunk/blender/CMakeLists.txt	2009-08-05 14:10:29 UTC (rev 22236)
@@ -208,7 +208,7 @@
   #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)

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2009-08-05 13:53:05 UTC (rev 22235)
+++ trunk/blender/config/win32-mingw-config.py	2009-08-05 14:10:29 UTC (rev 22236)
@@ -21,7 +21,7 @@
 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'

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2009-08-05 13:53:05 UTC (rev 22235)
+++ trunk/blender/config/win32-vc-config.py	2009-08-05 14:10:29 UTC (rev 22236)
@@ -22,7 +22,7 @@
 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'

Modified: trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-08-05 13:53:05 UTC (rev 22235)
+++ trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-08-05 14:10:29 UTC (rev 22236)
@@ -372,9 +372,6 @@
 	{
 #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::MakeCurrent() const
 {
-#ifdef WIN32
-	alcMakeContextCurrent(m_context);
-#endif
 }
 
 
@@ -614,11 +608,11 @@
 	// 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);





More information about the Bf-blender-cvs mailing list