From 5da02a4301441953f1b20d10e7cbbc3e8498d959 Mon Sep 17 00:00:00 2001
From: icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Mon, 5 Dec 2005 01:11:41 +0000
Subject: Look for correct filename extension when loading native DLLs.

git-svn-id: svn://svn.icculus.org/quake3/trunk@416 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/qcommon/q_platform.h | 16 ++++++++++++++++
 code/unix/unix_main.c     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'code')

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index b7ac01f..8859b7a 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -89,6 +89,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define Q3_LITTLE_ENDIAN
 
+#define DLL_EXT ".dll"
+
 #endif
 
 //============================================================== MAC OS X ===
@@ -112,6 +114,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 #endif
 
+#define DLL_EXT ".dylib"
+
 #endif
 
 //================================================================= LINUX ===
@@ -158,6 +162,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 #endif
 
+#define DLL_EXT ".so"
+
 #endif
 
 //=============================================================== FreeBSD ===
@@ -182,6 +188,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 #endif
 
+#define DLL_EXT ".so"
+
 #endif
 
 //================================================================= SUNOS ===
@@ -207,6 +215,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 #endif
 
+#define DLL_EXT ".so"
+
 #endif
 
 //================================================================== Q3VM ===
@@ -219,6 +229,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define ARCH_STRING "bytecode"
 
+#define DLL_EXT ".qvm"
+
 #endif
 
 //===========================================================================
@@ -240,6 +252,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #error "PATH_SEP not defined"
 #endif
 
+#ifndef DLL_EXT
+#error "DLL_EXT not defined"
+#endif
+
 
 //endianness
 short ShortSwap (short l);
diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c
index 6c50a25..80532b0 100644
--- a/code/unix/unix_main.c
+++ b/code/unix/unix_main.c
@@ -800,7 +800,7 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
   assert( name );
 
   getcwd(curpath, sizeof(curpath));
-  snprintf (fname, sizeof(fname), "%s" ARCH_STRING ".so", name);
+  snprintf (fname, sizeof(fname), "%s" ARCH_STRING DLL_EXT, name);
 
   // TODO: use fs_searchpaths from files.c
   pwdpath = Sys_Cwd();
-- 
cgit v1.2.3