From 217d41fc47bbf046bc5338f1a8e497592a0cc3f1 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 19 Aug 2010 15:47:13 +0000 Subject: [PATCH] add versioned dll names for a bunch of things git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10405 d7cf8633-e32d-0410-b094-e92efae38249 --- cap_ogg.c | 4 ++++ ft2.c | 2 +- image_png.c | 1 + snd_ogg.c | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cap_ogg.c b/cap_ogg.c index 013a0b56..3318c356 100644 --- 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 7a8b826a..9f7c3680 100644 --- 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", diff --git a/image_png.c b/image_png.c index ce6ba6db..4267331b 100644 --- a/image_png.c +++ b/image_png.c @@ -126,6 +126,7 @@ qboolean PNG_OpenLibrary (void) const char* dllnames [] = { #if WIN32 + "libpng14-14.dll", "libpng14.dll", "libpng12.dll", #elif defined(MACOSX) diff --git a/snd_ogg.c b/snd_ogg.c index ded0473c..2431430b 100644 --- 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) -- 2.39.2