* further cleanup of windows defaults for openal

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 51cd120dc724fa784dde962f9ce340135b7ff4f6..5711fa8e0a83bc0713c35634f8c09717d679dfe9 100644 (file)
--- 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
 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 = 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'
 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'
 
 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 302395795673179c2852bc459726ac195c8582bf..c226a2dca18cf747967e01f48da6b75a79e153ad 100644 (file)
--- 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
 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 = 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'
 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'
 
 # TODO - are these useful on win32?
 # BF_CXX = '/usr'

diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index 12f89e084822ba4df919b011e6adc2bbf55eb7e2..697b9141d14920c2c70e926e262d056ba49552f4 100644 (file)
--- 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 '
 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?
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 # TODO - are these useful on win32?