ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't search system directories for renderer lib

Browse source
This commit is contained in:
Thilo Schulz 2011-08-01 09:33:48 +00:00
parent 5a1449bd51
commit 404fe4e6e0
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/client/cl_curl.c
View file

@ -94,11 +94,11 @@ qboolean CL_cURL_Init()
Com_Printf("Loading \"%s\"...", cl_cURLLib->string);
if(!(cURLLib = Sys_LoadDll(cl_cURLLib->string)))
if(!(cURLLib = Sys_LoadDll(cl_cURLLib->string, qtrue)))
{
#ifdef ALTERNATE_CURL_LIB
// On some linux distributions there is no libcurl.so.3, but only libcurl.so.4. That one works too.
if(!(cURLLib = Sys_LoadDll(ALTERNATE_CURL_LIB)))
if(!(cURLLib = Sys_LoadDll(ALTERNATE_CURL_LIB, qtrue)))
#endif
return qfalse;
}

2
code/client/cl_main.c
View file

@ -3182,7 +3182,7 @@ void CL_InitRef( void ) {
Com_sprintf(dllName, sizeof(dllName), "renderer_%s_" ARCH_STRING DLL_EXT, cl_renderer->string);
if(!(rendererLib = Sys_LoadDll(dllName)) && strcmp(cl_renderer->string, cl_renderer->resetString))
if(!(rendererLib = Sys_LoadDll(dllName, qfalse)) && strcmp(cl_renderer->string, cl_renderer->resetString))
{
Cvar_ForceReset("cl_renderer");

2
code/client/qal.c
View file

@ -144,7 +144,7 @@ qboolean QAL_Init(const char *libname)
if(OpenALLib)
return qtrue;
if(!(OpenALLib = Sys_LoadDll(libname)))
if(!(OpenALLib = Sys_LoadDll(libname, qtrue)))
return qfalse;
alinit_fail = qfalse;

2
code/sys/sys_loadlib.h
View file

@ -48,4 +48,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# define Sys_LibraryError() SDL_GetError()
#endif
void * QDECL Sys_LoadDll(const char *name);
void * QDECL Sys_LoadDll(const char *name, qboolean useSystemLib);

8
code/sys/sys_main.c
View file

@ -417,12 +417,14 @@ from executable path, then fs_basepath.
=================
*/
void *Sys_LoadDll(const char *name)
void *Sys_LoadDll(const char *name, qboolean useSystemLib)
{
void *dllhandle;
Com_Printf("Try loading \"%s\"...\n", name);
if(!(dllhandle = Sys_LoadLibrary(name)))
if(useSystemLib)
Com_Printf("Try loading \"%s\"...\n", name);
if(!useSystemLib || !(dllhandle = Sys_LoadLibrary(name)))
{
const char *topDir;
char libPath[MAX_OSPATH];