always try native dll first

ioquake · Aug 30, 2005 · 2078cfa · 2078cfa
1 parent 4fb1caf
commit 2078cfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 );