From 2f409f37c32aad8deb0882a6d8ee72059337edd4 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 28 Aug 2011 16:41:18 -0700 Subject: [PATCH] Also check for libvorbisfile.dll and libvorbisidec.dll in Windows --- src/codec_vorbisfile.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/codec_vorbisfile.cpp b/src/codec_vorbisfile.cpp index ef1ea60..14cd550 100644 --- a/src/codec_vorbisfile.cpp +++ b/src/codec_vorbisfile.cpp @@ -73,22 +73,30 @@ public: { #ifdef HAS_VORBISIDEC #ifdef _WIN32 -#define VORBISFILE_LIB "vorbisidec.dll" +#define VORBISFILE_LIB "vorbisidec.dll" +#define VORBISFILE_LIB2 "libvorbisidec.dll" #elif defined(__APPLE__) -#define VORBISFILE_LIB "libvorbisidec.1.dylib" +#define VORBISFILE_LIB "libvorbisidec.1.dylib" +#define VORBISFILE_LIB2 0 #else -#define VORBISFILE_LIB "libvorbisidec.so.1" +#define VORBISFILE_LIB "libvorbisidec.so.1" +#define VORBISFILE_LIB2 0 #endif #else #ifdef _WIN32 -#define VORBISFILE_LIB "vorbisfile.dll" +#define VORBISFILE_LIB "vorbisfile.dll" +#define VORBISFILE_LIB2 "libvorbisfile.dll" #elif defined(__APPLE__) -#define VORBISFILE_LIB "libvorbisfile.3.dylib" +#define VORBISFILE_LIB "libvorbisfile.3.dylib" +#define VORBISFILE_LIB2 0 #else -#define VORBISFILE_LIB "libvorbisfile.so.3" +#define VORBISFILE_LIB "libvorbisfile.so.3" +#define VORBISFILE_LIB2 0 #endif #endif vorbisfile_handle = OpenLib(VORBISFILE_LIB); + if(!vorbisfile_handle && VORBISFILE_LIB2) + vorbisfile_handle = OpenLib(VORBISFILE_LIB2); if(!vorbisfile_handle) return; LOAD_FUNC(vorbisfile_handle, ov_clear); -- 2.11.4.GIT