Update build files to use new OpenAL libraries
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Dec 2011 09:37:19 +0000 (09:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Dec 2011 09:37:19 +0000 (09:37 +0000)
CMakeLists.txt
SConstruct
build_files/scons/config/linuxcross-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
source/creator/CMakeLists.txt

index fecb90708de3d85af9284d2c34e1c220073c3030..a7e9de026e48e7f25fcf203f771e2587c0b18832 100644 (file)
@@ -660,7 +660,7 @@ elseif(WIN32)
        if(WITH_OPENAL)
                set(OPENAL ${LIBDIR}/openal)
                set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-               set(OPENAL_LIBRARY wrap_oal)
+               set(OPENAL_LIBRARY OpenAL32)
                set(OPENAL_LIBPATH ${OPENAL}/lib)
        endif()
 
index 1a03827840461a2e5cdbc34d4807691a91245fea..88444c6131485020679b5db7182bc6e8ae7b6953 100644 (file)
@@ -756,7 +756,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 5e2c1d67d1ff777079764eb23d72c804690d281d..7ec27af9ea82a1fa099766853ce51d04262086b4 100644 (file)
@@ -13,7 +13,7 @@ WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 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'
index 6e65e093a46630dc0d337c3224f8f99fa68279db..d9fafbda5b04d3e9cc0c9894683402a4a3392a80 100644 (file)
@@ -14,7 +14,7 @@ BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PY
 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_FFMPEG = True
index 53ac9937885c5a66d913142a8bdc12c8f866a3d8..097740c4b858df7338f8b6a106d258cfadb5e78d 100644 (file)
@@ -20,7 +20,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 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 74a526a59f71966c8314b1e073d76c8d8182af07..f502d3ac360a263e07c558c176f0bdfdf7c0027e 100644 (file)
@@ -20,7 +20,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 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 48c7dca0b4dd3c1a3fbc7ada7e7191fbe612ed08..526268697777a467f8db9ee4d4a97458fa527912 100644 (file)
@@ -532,7 +532,6 @@ elseif(WIN32)
                install(
                        FILES
                                ${LIBDIR}/openal/lib/OpenAL32.dll
-                               ${LIBDIR}/openal/lib/wrap_oal.dll
                        DESTINATION ${TARGETDIR}
                )
        endif()