diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-05 18:42:42 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-05 18:42:42 +0400 |
| commit | d6c24138177f62e897baaa6e371acc476de57a5e (patch) | |
| tree | e0bbbce79ee3dafe7070556ef31e1a4ce9c2e9b1 | |
| parent | a73d3c0a747bf2aeb8dd08c278915ed415968d2a (diff) | |
* config changes for newer openal and samplerate change
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | config/win64-vc-config.py | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index c7a54dec25f..5f9ba627b23 100644 --- a/SConstruct +++ b/SConstruct @@ -566,7 +566,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): '${BF_ZLIB_LIBPATH}/zlib.dll', '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] - dllsources.append('${LCGDIR}/samplerate/lib/libsamplerate-0.dll') if env['WITH_BF_SDL']: if env['OURPLATFORM'] == 'win64-vc': pass # we link statically already to SDL on win64 diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index cc650e0b233..6d7bc9541ba 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -19,7 +19,7 @@ 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 = 'dxguid openal_static' +BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static' 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' diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 5fecbaa6336..0319d577ff3 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -16,13 +16,10 @@ BF_PYTHON_LIB = 'python31' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = False -WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'dxguid openal_static' +BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static' 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' |