change a few WIN64 checks to _WIN64 (which actually works), and remove
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 24 Dec 2009 16:36:41 +0000 (16:36 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 24 Dec 2009 16:36:41 +0000 (16:36 +0000)
the rest (dll names are the same, and ssize_t needs to be declared)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9679 d7cf8633-e32d-0410-b094-e92efae38249

13 files changed:
cap_ogg.c
cl_gecko.c
fs.c
ft2.c
image_png.c
jpeg.c
libcurl.c
qtypes.h
quakedef.h
snd_3dras.c
snd_modplug.c
snd_ogg.c
world.c

index 626efe4..424eac4 100644 (file)
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -521,9 +521,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 {
        const char* dllnames_og [] =
        {
-#if defined(WIN64)
-               "libogg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libogg.dll",
                "ogg.dll",
 #elif defined(MACOSX)
@@ -536,9 +534,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_vo [] =
        {
-#if defined(WIN64)
-               "libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -551,9 +547,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_ve [] =
        {
-#if defined(WIN64)
-               "libvorbisenc64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbisenc.dll",
                "vorbisenc.dll",
 #elif defined(MACOSX)
@@ -566,9 +560,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_th [] =
        {
-#if defined(WIN64)
-               "libtheora64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libtheora.dll",
                "theora.dll",
 #elif defined(MACOSX)
index 634b4d6..2aade4b 100644 (file)
@@ -551,7 +551,7 @@ static OSGK_ScriptResult dpGlobal_query (void* objTag, void* methTag,
   return result;
 }
 
-#if defined(WIN64)
+#if defined(_WIN64)
 # define XULRUNNER_DIR_SUFFIX  "win64"
 #elif defined(WIN32)
 # define XULRUNNER_DIR_SUFFIX  "win32"
@@ -848,9 +848,7 @@ qboolean CL_Gecko_OpenLibrary (void)
 {
        const char* dllnames_gecko [] =
        {
-#if defined(WIN64)
-               "OffscreenGecko64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "OffscreenGecko.dll",
 #elif defined(MACOSX)
                "OffscreenGecko.dylib",
diff --git a/fs.c b/fs.c
index fcc4470..8092ee1 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -428,9 +428,7 @@ qboolean PK3_OpenLibrary (void)
 #else
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "zlib64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 # ifdef ZLIB_USES_WINAPI
                "zlibwapi.dll",
                "zlib.dll",
diff --git a/ft2.c b/ft2.c
index e27f95b..7ed5ae5 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -169,9 +169,7 @@ qboolean Font_OpenLibrary (void)
 {
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "freetype6_x64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "freetype6.dll",
 #elif defined(MACOSX)
                "libfreetype.dylib",
index ca090b2..d57c189 100644 (file)
@@ -103,9 +103,7 @@ qboolean PNG_OpenLibrary (void)
 {
        const char* dllnames [] =
        {
-#ifdef WIN64
-               "libpng12_64.dll",
-#elif WIN32
+#if WIN32
                "libpng12.dll",
 #elif defined(MACOSX)
                "libpng12.0.dylib",
diff --git a/jpeg.c b/jpeg.c
index 6fbf0ee..d120ed8 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -490,9 +490,7 @@ qboolean JPEG_OpenLibrary (void)
 #else
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libjpeg.dll",
 #elif defined(MACOSX)
                "libjpeg.62.dylib",
index df2db7f..9824a46 100644 (file)
--- a/libcurl.c
+++ b/libcurl.c
@@ -318,9 +318,7 @@ static qboolean CURL_OpenLibrary (void)
 {
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "libcurl64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libcurl-4.dll",
                "libcurl-3.dll",
 #elif defined(MACOSX)
index 7c525a6..a945785 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -11,7 +11,7 @@ typedef enum qboolean_e {false, true} qboolean;
 typedef bool qboolean;
 #endif
 
-#if defined(WIN32) && !defined(WIN64)
+#if defined(WIN32)
 # define ssize_t long
 #endif
 
index bb586b1..a3efa6a 100644 (file)
@@ -372,7 +372,7 @@ extern cvar_t developer_loading;
 #if defined(__linux__)
 # define DP_OS_NAME            "Linux"
 # define DP_OS_STR             "linux"
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_OS_NAME            "Windows64"
 # define DP_OS_STR             "win64"
 #elif defined(WIN32)
@@ -405,7 +405,7 @@ extern cvar_t developer_loading;
 # elif defined(__powerpc__)
 #  define DP_ARCH_STR          "ppc"
 # endif
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_ARCH_STR           "x86_64"
 #elif defined(WIN32)
 # define DP_ARCH_STR           "x86"
index c984a3b..18860a5 100644 (file)
@@ -114,15 +114,13 @@ static dllfunction_t ras_funcs[] =
 };
 static const char* ras_dllname [] =
 {
-       #if defined(WIN64)
-               "3dras64.dll",
-       #elif defined(WIN32)
+#if defined(WIN32)
                "3dras32.dll",
-       #elif defined(MACOSX)
+#elif defined(MACOSX)
                "3dras.dylib",
-       #else
+#else
                "3dras.so",
-       #endif
+#endif
                NULL
 };
 
index 9cb4869..98d3706 100644 (file)
@@ -133,9 +133,7 @@ qboolean ModPlug_OpenLibrary (void)
 {
        const char* dllnames_modplug [] =
        {
-#if defined(WIN64)
-               "libmodplug64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libmodplug-0.dll",
                "modplug.dll",
 #elif defined(MACOSX)
index 693ed0a..a5dba1d 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -312,9 +312,7 @@ qboolean OGG_OpenLibrary (void)
 {
        const char* dllnames_vo [] =
        {
-#if defined(WIN64)
-               "libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -327,9 +325,7 @@ qboolean OGG_OpenLibrary (void)
        };
        const char* dllnames_vf [] =
        {
-#if defined(WIN64)
-               "libvorbisfile64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbisfile.dll",
                "vorbisfile.dll",
 #elif defined(MACOSX)
diff --git a/world.c b/world.c
index 3977a5d..935abfb 100644 (file)
--- a/world.c
+++ b/world.c
@@ -1449,9 +1449,7 @@ static void World_Physics_Init(void)
 #ifdef ODE_DYNAMIC
        const char* dllnames [] =
        {
-# if defined(WIN64)
-               "libode1_64.dll",
-# elif defined(WIN32)
+# if defined(WIN32)
                "libode1.dll",
 # elif defined(MACOSX)
                "libode.1.dylib",