diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2015-01-28 12:36:19 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2015-01-28 12:36:19 +0300 |
| commit | ce52e781b063f1e2a9942454cb54bff568fa3b8d (patch) | |
| tree | 97fd3789a0cc92b4e07395ac60edcba1b87ef608 | |
| parent | e17c6f79a57513eb1584fa79f698a8f3a85e0d9a (diff) | |
Switch windows MSVC builds to OpenAL-soft
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 4dacf89fcb0..9e5d434da98 100644 --- a/SConstruct +++ b/SConstruct @@ -1208,7 +1208,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): if env['WITH_BF_OPENAL']: dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') - dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') if env['WITH_BF_SNDFILE']: dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index d447a1ec08e..362ce8ebc1d 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -33,7 +33,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = True WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' -BF_OPENAL_LIB = 'wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_ICONV = True diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index b8e4f3d70fe..e2d23cef59d 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -34,7 +34,7 @@ WITH_BF_PYTHON_INSTALL_NUMPY = True WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' -BF_OPENAL_LIB = 'wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_SNDFILE = True diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index f4d643288ec..f51b7bec7c9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -761,7 +761,6 @@ elseif(WIN32) install( FILES ${LIBDIR}/openal/lib/OpenAL32.dll - ${LIBDIR}/openal/lib/wrap_oal.dll DESTINATION "." ) endif() |