diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-07-29 20:18:37 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 22:55:15 +0000 |
| commit | 64280de4fc1621c1280407acc9e1043043319ca0 (patch) | |
| tree | d9e7cb6b88abbcc1ecef045b090a9e1fc0eba696 /src/qcommon | |
| parent | 7f1fee44e5cd45cff829951757f5c6460c06cbe8 (diff) | |
Change DLL search path order for external libraries that are linked at runtime, like libcurl or libopenal to: * system library paths * executable path * fs_basepath
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | src/qcommon/vm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 275fb4a5..980d0cfb 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -1042,7 +1042,7 @@ typedef enum { void Sys_Init (void); // general development dll loading for virtual machine testing -void * QDECL Sys_LoadDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...), +void * QDECL Sys_LoadQVMDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...), intptr_t (QDECL *systemcalls)(intptr_t, ...) ); void Sys_UnloadDll( void *dllHandle ); diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c index 2fdb77f0..536b2ff7 100644 --- a/src/qcommon/vm.c +++ b/src/qcommon/vm.c @@ -580,7 +580,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *), { Com_Printf("Try loading dll file %s\n", filename); - vm->dllHandle = Sys_LoadDll(filename, &vm->entryPoint, VM_DllSyscall); + vm->dllHandle = Sys_LoadQVMDll(filename, &vm->entryPoint, VM_DllSyscall); if(vm->dllHandle) { |