forked from bartvdbraak/blender
Reverting changes made to build systems when was upgrading OpenAL.
Reverting to openal from creative because own builds doesn't deal with 3D sound. Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which libraries were updated to openal-soft).
This commit is contained in:
parent
e8a1daaf9b
commit
29f0ff718b
@ -691,7 +691,7 @@ elseif(WIN32)
|
|||||||
if(WITH_OPENAL)
|
if(WITH_OPENAL)
|
||||||
set(OPENAL ${LIBDIR}/openal)
|
set(OPENAL ${LIBDIR}/openal)
|
||||||
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
|
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
|
||||||
set(OPENAL_LIBRARY OpenAL32)
|
set(OPENAL_LIBRARY wrap_oal)
|
||||||
set(OPENAL_LIBPATH ${OPENAL}/lib)
|
set(OPENAL_LIBPATH ${OPENAL}/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -756,6 +756,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
|
|||||||
|
|
||||||
if env['WITH_BF_OPENAL']:
|
if env['WITH_BF_OPENAL']:
|
||||||
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
|
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
|
||||||
|
dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
|
||||||
|
|
||||||
if env['WITH_BF_SNDFILE']:
|
if env['WITH_BF_SNDFILE']:
|
||||||
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
|
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
|
||||||
|
@ -13,7 +13,7 @@ WITH_BF_OPENAL = True
|
|||||||
WITH_BF_STATICOPENAL = False
|
WITH_BF_STATICOPENAL = False
|
||||||
BF_OPENAL = LIBDIR + '/openal'
|
BF_OPENAL = LIBDIR + '/openal'
|
||||||
BF_OPENAL_INC = '${BF_OPENAL}/include'
|
BF_OPENAL_INC = '${BF_OPENAL}/include'
|
||||||
BF_OPENAL_LIB = 'OpenAL32'
|
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.
|
# Warning, this static lib configuration is untested! users of this OS please confirm.
|
||||||
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
|
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
|
||||||
|
@ -14,7 +14,7 @@ BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PY
|
|||||||
WITH_BF_OPENAL = True
|
WITH_BF_OPENAL = True
|
||||||
BF_OPENAL = LIBDIR + '/openal'
|
BF_OPENAL = LIBDIR + '/openal'
|
||||||
BF_OPENAL_INC = '${BF_OPENAL}/include'
|
BF_OPENAL_INC = '${BF_OPENAL}/include'
|
||||||
BF_OPENAL_LIB = 'OpenAL32'
|
BF_OPENAL_LIB = 'wrap_oal'
|
||||||
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
||||||
|
|
||||||
WITH_BF_FFMPEG = True
|
WITH_BF_FFMPEG = True
|
||||||
|
@ -20,7 +20,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
|
|||||||
WITH_BF_OPENAL = True
|
WITH_BF_OPENAL = True
|
||||||
BF_OPENAL = LIBDIR + '/openal'
|
BF_OPENAL = LIBDIR + '/openal'
|
||||||
BF_OPENAL_INC = '${BF_OPENAL}/include '
|
BF_OPENAL_INC = '${BF_OPENAL}/include '
|
||||||
BF_OPENAL_LIB = 'OpenAL32'
|
BF_OPENAL_LIB = 'wrap_oal'
|
||||||
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
||||||
|
|
||||||
WITH_BF_ICONV = True
|
WITH_BF_ICONV = True
|
||||||
|
@ -20,7 +20,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
|
|||||||
WITH_BF_OPENAL = True
|
WITH_BF_OPENAL = True
|
||||||
BF_OPENAL = LIBDIR + '/openal'
|
BF_OPENAL = LIBDIR + '/openal'
|
||||||
BF_OPENAL_INC = '${BF_OPENAL}/include '
|
BF_OPENAL_INC = '${BF_OPENAL}/include '
|
||||||
BF_OPENAL_LIB = 'OpenAL32'
|
BF_OPENAL_LIB = 'wrap_oal'
|
||||||
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
|
||||||
|
|
||||||
WITH_BF_SNDFILE = True
|
WITH_BF_SNDFILE = True
|
||||||
|
@ -558,6 +558,7 @@ elseif(WIN32)
|
|||||||
install(
|
install(
|
||||||
FILES
|
FILES
|
||||||
${LIBDIR}/openal/lib/OpenAL32.dll
|
${LIBDIR}/openal/lib/OpenAL32.dll
|
||||||
|
${LIBDIR}/openal/lib/wrap_oal.dll
|
||||||
DESTINATION ${TARGETDIR}
|
DESTINATION ${TARGETDIR}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user