From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Thu, 6 Aug 2009 13:01:24 +0000 (+0000)
Subject: * further cleanup of windows defaults for openal
X-Git-Tag: v2.50~1395^2~629
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/9eff68a9e91f79b29dcbf133c5b626a9c54bfeb0

* further cleanup of windows defaults for openal
---

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 51cd120dc72..5711fa8e0a8 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -16,13 +16,10 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
 
 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 = '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'
 
 WITH_BF_FFMPEG = False
 BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 30239579567..c226a2dca18 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -16,13 +16,10 @@ BF_PYTHON_LIB = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 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 = 'OpenAL32 wrap_oal' #'dxguid openal_static'
+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'
 
 # TODO - are these useful on win32?
 # BF_CXX = '/usr'
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index 12f89e08482..697b9141d14 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -18,7 +18,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 WITH_BF_OPENAL = False 
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static'
+BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 # TODO - are these useful on win32?