From 7c456040129611c4dee9afd5e42bff01a086778b Mon Sep 17 00:00:00 2001
From: Mark Olsen <isthisinuse@users.sourceforge.net>
Date: Thu, 10 May 2012 12:56:18 +0000
Subject: [PATCH] Use dynload.library by default. dlopen() and friends will now
 only work on MorphOS 2.0+.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4039 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/sys_morphos.c | 6 ------
 engine/common/qvm.c         | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/engine/client/sys_morphos.c b/engine/client/sys_morphos.c
index 590841f6b..cfbeb2f7a 100755
--- a/engine/client/sys_morphos.c
+++ b/engine/client/sys_morphos.c
@@ -34,9 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 int __stack = 4*1024*1024;
 
-#if I_AM_BIGFOOT
 struct Library *DynLoadBase;
-#endif
 
 extern struct Library *VorbisFileBase;
 
@@ -50,13 +48,11 @@ void Sys_RecentServer(char *command, char *target, char *title, char *desc)
 
 void Sys_Shutdown()
 {
-#if I_AM_BIGFOOT
 	if(DynLoadBase)
 	{
 		CloseLibrary(DynLoadBase);
 		DynLoadBase = 0;
 	}
-#endif
 
 	if (VorbisFileBase)
 	{
@@ -419,9 +415,7 @@ int main(int argc, char **argv)
 	if (parms.membase == 0)
 		Sys_Error("Can't allocated %d bytes\n", parms.memsize);
 
-#if I_AM_BIGFOOT
 	DynLoadBase = OpenLibrary("dynload.library", 0);
-#endif
 
 	Host_Init(&parms);
 
diff --git a/engine/common/qvm.c b/engine/common/qvm.c
index 7ec3d908e..c517521d3 100644
--- a/engine/common/qvm.c
+++ b/engine/common/qvm.c
@@ -33,6 +33,10 @@ Also, can efficiency be improved much?
 */
 
 
+#ifdef __MORPHOS__
+#include <proto/dynload.h>
+#endif
+
 #include "quakedef.h"
 
 #ifdef VM_ANY
@@ -84,7 +88,7 @@ dllhandle_t *QVM_LoadDLL(const char *name, void **vmMain, sys_calldll_t syscall)
 		{NULL, NULL},
 	};
 
-#if defined(__MORPHOS__) && I_AM_BIGFOOT
+#ifdef __MORPHOS__
 	if (DynLoadBase == 0)
 		return 0;
 #endif