From 3ac08ec908041c45cd697ac67b6b6eaafd2a3e33 Mon Sep 17 00:00:00 2001 From: ludwig Date: Tue, 30 Aug 2005 15:38:05 +0000 Subject: always try native dll first git-svn-id: svn://svn.icculus.org/quake3/trunk@32 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/qcommon/vm.c | 3 ++- code/unix/unix_main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'code') diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c index a7f86ab..8cd3062 100644 --- a/code/qcommon/vm.c +++ b/code/qcommon/vm.c @@ -484,7 +484,8 @@ vm_t *VM_Create( const char *module, int (*systemCalls)(int *), } } - if ( interpret == VMI_NATIVE ) { + // always try dll first? -- ln + if ( 1 || interpret == VMI_NATIVE ) { // try to load as a system dll Com_Printf( "Loading dll file %s.\n", vm->name ); vm->dllHandle = Sys_LoadDll( module, vm->fqpath , &vm->entryPoint, VM_DllSyscall ); diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c index 4671f6d..e7676c6 100644 --- a/code/unix/unix_main.c +++ b/code/unix/unix_main.c @@ -775,7 +775,8 @@ void *Sys_LoadDll( const char *name, char *fqpath , if ( !libHandle ) { -#ifndef NDEBUG // bk001206 - in debug abort on failure +#if 0 // don't abort -- ln +//#ifndef NDEBUG // bk001206 - in debug abort on failure Com_Error ( ERR_FATAL, "Sys_LoadDll(%s) failed dlopen() completely!\n", name ); #else Com_Printf ( "Sys_LoadDll(%s) failed dlopen() completely!\n", name ); -- cgit v1.2.3