[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42891] trunk/blender: Update build files to use new OpenAL libraries

[Sergey Sharybin]

Revision: 42891
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42891
Author:   nazgul
Date:     2011-12-27 09:37:19 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Update build files to use new OpenAL libraries

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	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/CMakeLists.txt	2011-12-27 09:37:19 UTC (rev 42891)
@@ -660,7 +660,7 @@
 	if(WITH_OPENAL)
 		set(OPENAL ${LIBDIR}/openal)
 		set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		set(OPENAL_LIBRARY wrap_oal)
+		set(OPENAL_LIBRARY OpenAL32)
 		set(OPENAL_LIBPATH ${OPENAL}/lib)
 	endif()
 

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/SConstruct	2011-12-27 09:37:19 UTC (rev 42891)
@@ -756,7 +756,6 @@
 
     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	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2011-12-27 09:37:19 UTC (rev 42891)
@@ -13,7 +13,7 @@
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 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	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-12-27 09:37:19 UTC (rev 42891)
@@ -14,7 +14,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 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	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2011-12-27 09:37:19 UTC (rev 42891)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 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	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-12-27 09:37:19 UTC (rev 42891)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SNDFILE = True

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-12-27 09:36:19 UTC (rev 42890)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-12-27 09:37:19 UTC (rev 42891)
@@ -532,7 +532,6 @@
 		install(
 			FILES
 				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()