use *64.dll instead of *.dll on win64, this way we can include both 32bit and 64bit...

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 9b9d7c8f181d73c0aa5162ec83c093c91e9f89a8..37da2ab57e66ee062ad1683a9b16aa71dde6edf4 100644 (file)
--- 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 420fda737a3e411161a79293161d4c276edb7e80..b0a8da9072e740d100e1c8880b4ccfb17a05559f 100644 (file)
--- 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 ee2ecfcfc06a36940bb86df7391c8778d4a0d3f2..a342f4a809d4285bac8435647b671521d6301971 100644 (file)
--- 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",