[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22241] branches/soundsystem: * config changes for newer openal and samplerate change
Nathan Letwory
jesterking at letwory.net
Wed Aug 5 16:42:42 CEST 2009
Revision: 22241
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22241
Author: jesterking
Date: 2009-08-05 16:42:42 +0200 (Wed, 05 Aug 2009)
Log Message:
-----------
* config changes for newer openal and samplerate change
Modified Paths:
--------------
branches/soundsystem/SConstruct
branches/soundsystem/config/win32-vc-config.py
branches/soundsystem/config/win64-vc-config.py
Modified: branches/soundsystem/SConstruct
===================================================================
--- branches/soundsystem/SConstruct 2009-08-05 14:40:38 UTC (rev 22240)
+++ branches/soundsystem/SConstruct 2009-08-05 14:42:42 UTC (rev 22241)
@@ -566,7 +566,6 @@
'${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
Modified: branches/soundsystem/config/win32-vc-config.py
===================================================================
--- branches/soundsystem/config/win32-vc-config.py 2009-08-05 14:40:38 UTC (rev 22240)
+++ branches/soundsystem/config/win32-vc-config.py 2009-08-05 14:42:42 UTC (rev 22241)
@@ -19,7 +19,7 @@
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'
Modified: branches/soundsystem/config/win64-vc-config.py
===================================================================
--- branches/soundsystem/config/win64-vc-config.py 2009-08-05 14:40:38 UTC (rev 22240)
+++ branches/soundsystem/config/win64-vc-config.py 2009-08-05 14:42:42 UTC (rev 22241)
@@ -16,13 +16,10 @@
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'
More information about the Bf-blender-cvs
mailing list