ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-06-02 09:51:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Disable ccache by default. If you want it, add USE_CCACHE=1 to Makefile.local

Browse source 
* Remove -gfull from linux section in Makefile -- it's darwin only
* Cast away some warnings that surfaced from using "new" AL headers
* Various whitespace and consistency fixes
This commit is contained in:
Tim Angus 2005-11-26 15:01:28 +00:00
parent 877f360812
commit 382c6adb54
11 changed files with 125 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

51
code/unix/unix_main.c
View file

@ -364,24 +364,22 @@ void Sys_Quit (void) {
static void Sys_DetectAltivec(void)
{
extern cvar_t *com_altivec;
// Only detect if user hasn't forcibly disabled it.
if (com_altivec->integer) {
#if idppc_altivec
#if MACOS_X
{
long feat = 0;
OSErr err = Gestalt(gestaltPowerPCProcessorFeatures, &feat);
if ((err==noErr) && ((1 << gestaltPowerPCHasVectorInstructions) & feat))
com_altivec->integer = 1;
}
#else // !!! FIXME: PowerPC Linux, etc: how to detect?
com_altivec->integer = 1;
#endif
#else
com_altivec->integer = 0; // not an Altivec system, so never use it.
#endif
#if idppc_altivec
#ifdef MACOS_X
long feat = 0;
OSErr err = Gestalt(gestaltPowerPCProcessorFeatures, &feat);
if ((err==noErr) && ((1 << gestaltPowerPCHasVectorInstructions) & feat)) {
Cvar_Set( "com_altivec", "1" );
}
#else // !!! FIXME: PowerPC Linux, etc: how to detect?
Cvar_Set( "com_altivec", "1" );
#endif
#else
// not an Altivec system, so never use it.
Cvar_Set( "com_altivec", "0" );
#endif
}
}
@ -705,9 +703,9 @@ void Sys_UnloadDll( void *dllHandle ) {
return;
}
#if USE_SDL_VIDEO
#if USE_SDL_VIDEO
SDL_UnloadObject(dllHandle);
#else
#else
dlclose( dllHandle );
{
const char* err; // rb010123 - now const
@ -715,7 +713,7 @@ void Sys_UnloadDll( void *dllHandle ) {
if ( err != NULL )
Com_Printf ( "Sys_UnloadGame failed on dlclose: \"%s\"!\n", err );
}
#endif
#endif
}
@ -745,11 +743,11 @@ static void* try_dlopen(const char* base, const char* gamedir, const char* fname
fn = FS_BuildOSPath( base, gamedir, fname );
Com_Printf( "Sys_LoadDll(%s)... \n", fn );
#if USE_SDL_VIDEO
#if USE_SDL_VIDEO
libHandle = SDL_LoadObject(fn);
#else
#else
libHandle = dlopen( fn, Q_RTLD );
#endif
#endif
if(!libHandle) {
Com_Printf( "Sys_LoadDll(%s) failed:\n\"%s\"\n", fn, do_dlerror() );
@ -827,14 +825,15 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
#else
Com_Printf ( "Sys_LoadDll(%s) failed dlsym(vmMain):\n\"%s\" !\n", name, err );
#endif
#if USE_SDL_VIDEO
#if USE_SDL_VIDEO
SDL_UnloadObject(libHandle);
#else
#else
dlclose( libHandle );
err = do_dlerror();
if ( err != NULL )
if ( err != NULL ) {
Com_Printf ( "Sys_LoadDll(%s) failed dlcose:\n\"%s\"\n", name, err );
#endif
}
#endif
return NULL;
}