Switch windows MSVC builds to OpenAL-soft
authorMartijn Berger <martijn.berger@gmail.com>
Wed, 28 Jan 2015 09:36:19 +0000 (10:36 +0100)
committerMartijn Berger <martijn.berger@gmail.com>
Wed, 28 Jan 2015 09:36:19 +0000 (10:36 +0100)
SConstruct
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
source/creator/CMakeLists.txt

index 4dacf89fcb0c3e6c6c07f0078fba857a1ccd9917..9e5d434da98e2c5c2378ab8ed68370c5c86cfd72 100644 (file)
@@ -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')
index d447a1ec08eb8fd24de02dadfa52e7f14ed15bca..362ce8ebc1daa9728420c9c3f1014c7f0faab139 100644 (file)
@@ -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
index b8e4f3d70fe1e8c575451027a13375082eb4fd25..e2d23cef59d30800baf36596c083ec028a2849f2 100644 (file)
@@ -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
index f4d643288ecd9090a20c372c73c15aef73bbcc9a..f51b7bec7c9072aa4fa55b2d1eb785f59ec0c04d 100644 (file)
@@ -761,7 +761,6 @@ elseif(WIN32)
                install(
                        FILES
                                ${LIBDIR}/openal/lib/OpenAL32.dll
-                               ${LIBDIR}/openal/lib/wrap_oal.dll
                        DESTINATION "."
                )
        endif()