[Bf-blender-cvs] [ce52e78] master: Switch windows MSVC builds to OpenAL-soft

[Martijn Berger]

Commit: ce52e781b063f1e2a9942454cb54bff568fa3b8d
Author: Martijn Berger
Date:   Wed Jan 28 10:36:19 2015 +0100
Branches: master
https://developer.blender.org/rBce52e781b063f1e2a9942454cb54bff568fa3b8d

Switch windows MSVC builds to OpenAL-soft

===================================================================

M	SConstruct
M	build_files/scons/config/win32-vc-config.py
M	build_files/scons/config/win64-vc-config.py
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/SConstruct b/SConstruct
index 4dacf89..9e5d434 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1208,7 +1208,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
 
     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')
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index d447a1e..362ce8e 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -33,7 +33,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = True
 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
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index b8e4f3d..e2d23ce 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -34,7 +34,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = True
 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
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f4d6432..f51b7be 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -761,7 +761,6 @@ elseif(WIN32)
 		install(
 			FILES
 				${LIBDIR}/openal/lib/OpenAL32.dll
-				${LIBDIR}/openal/lib/wrap_oal.dll
 			DESTINATION "."
 		)
 	endif()