fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use dynload.library by default. dlopen() and friends will now only work on MorphOS 2.0+.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4039 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2012-05-10 12:56:18 +00:00
parent 8e5035d08a
commit 7c45604012
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/client/sys_morphos.c
View file

@ -34,9 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
int __stack = 4*1024*1024; int __stack = 4*1024*1024;
#if I_AM_BIGFOOT
struct Library *DynLoadBase; struct Library *DynLoadBase;
#endif
extern struct Library *VorbisFileBase; extern struct Library *VorbisFileBase;
@ -50,13 +48,11 @@ void Sys_RecentServer(char *command, char *target, char *title, char *desc)
void Sys_Shutdown() void Sys_Shutdown()
{ {
#if I_AM_BIGFOOT
if(DynLoadBase) if(DynLoadBase)
{ {
CloseLibrary(DynLoadBase); CloseLibrary(DynLoadBase);
DynLoadBase = 0; DynLoadBase = 0;
} }
#endif
if (VorbisFileBase) if (VorbisFileBase)
{ {
@ -419,9 +415,7 @@ int main(int argc, char **argv)
if (parms.membase == 0) if (parms.membase == 0)
Sys_Error("Can't allocated %d bytes\n", parms.memsize); Sys_Error("Can't allocated %d bytes\n", parms.memsize);
#if I_AM_BIGFOOT
DynLoadBase = OpenLibrary("dynload.library", 0); DynLoadBase = OpenLibrary("dynload.library", 0);
#endif
Host_Init(&parms); Host_Init(&parms);

6
engine/common/qvm.c
View file

@ -33,6 +33,10 @@ Also, can efficiency be improved much?
*/ */
#ifdef __MORPHOS__
#include <proto/dynload.h>
#endif
#include "quakedef.h" #include "quakedef.h"
#ifdef VM_ANY #ifdef VM_ANY
@ -84,7 +88,7 @@ dllhandle_t *QVM_LoadDLL(const char *name, void **vmMain, sys_calldll_t syscall)
{NULL, NULL}, {NULL, NULL},
}; };
#if defined(__MORPHOS__) && I_AM_BIGFOOT #ifdef __MORPHOS__
if (DynLoadBase == 0) if (DynLoadBase == 0)
return 0; return 0;
#endif #endif