From: havoc Date: Sun, 10 Jul 2005 12:33:20 +0000 (+0000) Subject: use *64.dll instead of *.dll on win64, this way we can include both 32bit and 64bit... X-Git-Tag: xonotic-v0.1.0preview~4671 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c81e060b8ad1da8f3fafd5ff2a6d580d933653b;p=xonotic%2Fdarkplaces.git use *64.dll instead of *.dll on win64, this way we can include both 32bit and 64bit dlls in the same releases git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5517 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/fs.c b/fs.c index 9b9d7c8f..37da2ab5 100644 --- a/fs.c +++ b/fs.c @@ -332,7 +332,9 @@ qboolean PK3_OpenLibrary (void) { const char* dllnames [] = { -#ifdef WIN32 +#if defined(WIN64) + "zlib64.dll", +#elif defined(WIN32) "zlib.dll", #elif defined(MACOSX) "libz.dylib", diff --git a/jpeg.c b/jpeg.c index 420fda73..b0a8da90 100644 --- a/jpeg.c +++ b/jpeg.c @@ -397,7 +397,9 @@ qboolean JPEG_OpenLibrary (void) { const char* dllnames [] = { -#ifdef WIN32 +#if defined(WIN64) + "libjpeg64.dll", +#elif defined(WIN32) "libjpeg.dll", #elif defined(MACOSX) "libjpeg.62.dylib", diff --git a/snd_ogg.c b/snd_ogg.c index ee2ecfcf..a342f4a8 100644 --- a/snd_ogg.c +++ b/snd_ogg.c @@ -296,7 +296,9 @@ qboolean OGG_OpenLibrary (void) { const char* dllnames_vo [] = { -#ifdef WIN32 +#if defined(WIN64) + "vorbis64.dll", +#elif defined(WIN32) "vorbis.dll", #elif defined(MACOSX) "libvorbis.dylib", @@ -308,7 +310,9 @@ qboolean OGG_OpenLibrary (void) }; const char* dllnames_vf [] = { -#ifdef WIN32 +#if defined(WIN64) + "vorbisfile64.dll", +#elif defined(WIN32) "vorbisfile.dll", #elif defined(MACOSX) "libvorbisfile.dylib",