use *64.dll instead of *.dll on win64, this way we can include both 32bit and 64bit...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 10 Jul 2005 12:33:20 +0000 (12:33 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 10 Jul 2005 12:33:20 +0000 (12:33 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5517 d7cf8633-e32d-0410-b094-e92efae38249

fs.c
jpeg.c
snd_ogg.c

diff --git a/fs.c b/fs.c
index 9b9d7c8..37da2ab 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 420fda7..b0a8da9 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",
index ee2ecfc..a342f4a 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",