[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44196] trunk/blender: Reverting changes made to build systems when was upgrading OpenAL.

[Sergey Sharybin]

Revision: 44196
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44196
Author:   nazgul
Date:     2012-02-17 16:58:34 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Reverting changes made to build systems when was upgrading OpenAL.

Reverting to openal from creative because own builds doesn't deal with 3D sound.
Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which
libraries were updated to openal-soft).

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/CMakeLists.txt	2012-02-17 16:58:34 UTC (rev 44196)
@@ -691,7 +691,7 @@
 	if(WITH_OPENAL)
 		set(OPENAL ${LIBDIR}/openal)
 		set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		set(OPENAL_LIBRARY OpenAL32)
+		set(OPENAL_LIBRARY wrap_oal)
 		set(OPENAL_LIBPATH ${OPENAL}/lib)
 	endif()
 

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/SConstruct	2012-02-17 16:58:34 UTC (rev 44196)
@@ -756,6 +756,7 @@
 
     if env['WITH_BF_OPENAL']:
         dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
+        dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
 
     if env['WITH_BF_SNDFILE']:
         dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')

Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2012-02-17 16:58:34 UTC (rev 44196)
@@ -13,7 +13,7 @@
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIB = 'OpenAL32 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/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2012-02-17 16:58:34 UTC (rev 44196)
@@ -14,7 +14,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = True

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-02-17 16:58:34 UTC (rev 44196)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = True

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-02-17 16:58:34 UTC (rev 44196)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SNDFILE = True

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-02-17 16:58:09 UTC (rev 44195)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-02-17 16:58:34 UTC (rev 44196)
@@ -558,6 +558,7 @@
 		install(
 			FILES
 				${LIBDIR}/openal/lib/OpenAL32.dll
+				${LIBDIR}/openal/lib/wrap_oal.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()