]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
add versioned dll names for a bunch of things
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 19 Aug 2010 15:47:13 +0000 (15:47 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 19 Aug 2010 15:47:13 +0000 (15:47 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10405 d7cf8633-e32d-0410-b094-e92efae38249

cap_ogg.c
ft2.c
image_png.c
snd_ogg.c

index 013a0b566cc16ee9d1904db2885be261cb8bb27a..3318c356c4119bb34e0465ed7307d3c4de7aa568 100644 (file)
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -522,6 +522,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        const char* dllnames_og [] =
        {
 #if defined(WIN32)
+               "libogg-0.dll",
                "libogg.dll",
                "ogg.dll",
 #elif defined(MACOSX)
@@ -535,6 +536,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        const char* dllnames_vo [] =
        {
 #if defined(WIN32)
+               "libvorbis-0.dll",
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -548,6 +550,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        const char* dllnames_ve [] =
        {
 #if defined(WIN32)
+               "libvorbisenc-2.dll",
                "libvorbisenc.dll",
                "vorbisenc.dll",
 #elif defined(MACOSX)
@@ -561,6 +564,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        const char* dllnames_th [] =
        {
 #if defined(WIN32)
+               "libtheora-0.dll",
                "libtheora.dll",
                "theora.dll",
 #elif defined(MACOSX)
diff --git a/ft2.c b/ft2.c
index 7a8b826a8204533a07dbf467ff411fd6c5b11404..9f7c36800d747c27feb7aa0d4b934f19e6fcc421 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -186,8 +186,8 @@ qboolean Font_OpenLibrary (void)
        const char* dllnames [] =
        {
 #if defined(WIN32)
-               "freetype6.dll",
                "libfreetype-6.dll",
+               "freetype6.dll",
 #elif defined(MACOSX)
                "libfreetype.6.dylib",
                "libfreetype.dylib",
index ce6ba6db31f28de4255ef9273f0e37e0ca9bc390..4267331be738462ceaacfd07541f5bedab60861a 100644 (file)
@@ -126,6 +126,7 @@ qboolean PNG_OpenLibrary (void)
        const char* dllnames [] =
        {
 #if WIN32
+               "libpng14-14.dll",
                "libpng14.dll",
                "libpng12.dll",
 #elif defined(MACOSX)
index ded0473cf38d329dc6618e314e87408de14724ff..2431430b0af7ae84f0fb9ca83f1980904a69ba74 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -274,6 +274,7 @@ qboolean OGG_OpenLibrary (void)
        const char* dllnames_vo [] =
        {
 #if defined(WIN32)
+               "libvorbis-0.dll",
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -287,6 +288,7 @@ qboolean OGG_OpenLibrary (void)
        const char* dllnames_vf [] =
        {
 #if defined(WIN32)
+               "libvorbisfile-3.dll",
                "libvorbisfile.dll",
                "vorbisfile.dll",
 #elif defined(MACOSX)