ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-14 22:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed some warnings on the OS X build

Browse source
This commit is contained in:
Tim Angus 2005-10-26 19:32:15 +00:00
parent 9f55ae2dce
commit 3ff42330e5
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/macosx/Quake3.pbproj/project.pbxproj
View file

@ -34,6 +34,7 @@
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = "-bundle -undefined error"; OTHER_LDFLAGS = "-bundle -undefined error";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = qagame; PRODUCT_NAME = qagame;
PROFILE_FLAGS = ""; PROFILE_FLAGS = "";
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
@ -170,6 +171,7 @@
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = "-bundle -undefined error"; OTHER_LDFLAGS = "-bundle -undefined error";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = cgame; PRODUCT_NAME = cgame;
PROFILE_FLAGS = ""; PROFILE_FLAGS = "";
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
@ -4764,6 +4766,7 @@
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = "-bundle -undefined error"; OTHER_LDFLAGS = "-bundle -undefined error";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = ui; PRODUCT_NAME = ui;
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@ -4977,6 +4980,7 @@
OTHER_CFLAGS = "-DDEDICATED -DMACOS_X -DBOTLIB -DMISSIONPACK -force_cpusubtype_ALL -Wno-long-double"; OTHER_CFLAGS = "-DDEDICATED -DMACOS_X -DBOTLIB -DMISSIONPACK -force_cpusubtype_ALL -Wno-long-double";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = Q3DedicatedServer; PRODUCT_NAME = Q3DedicatedServer;
REZ_EXECUTABLE = YES; REZ_EXECUTABLE = YES;
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
@ -7716,8 +7720,8 @@
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-O2"; OPTIMIZATION_CFLAGS = "-O2";
OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL"; OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = Quake3; PRODUCT_NAME = Quake3;
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
USE_GCC3_PFE_SUPPORT = NO; USE_GCC3_PFE_SUPPORT = NO;
@ -8758,6 +8762,7 @@
OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec"; OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = "Quake3 G4"; PRODUCT_NAME = "Quake3 G4";
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";
USE_GCC3_PFE_SUPPORT = NO; USE_GCC3_PFE_SUPPORT = NO;
@ -10327,6 +10332,7 @@
OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec -falign-loops=16 -falign-jumps=16 -fstrict-aliasing "; OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec -falign-loops=16 -falign-jumps=16 -fstrict-aliasing ";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
OTHER_REZFLAGS = ""; OTHER_REZFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = Q3DedicatedServer; PRODUCT_NAME = Q3DedicatedServer;
REZ_EXECUTABLE = YES; REZ_EXECUTABLE = YES;
SECTORDER_FLAGS = ""; SECTORDER_FLAGS = "";

4
code/macosx/macosx_display.m
View file

@ -232,7 +232,6 @@ void Sys_SetScreenFade(glwgamma_t *table, float fraction)
void Sys_FadeScreens() void Sys_FadeScreens()
{ {
CGDisplayCount displayIndex; CGDisplayCount displayIndex;
int stepIndex;
glwgamma_t *table; glwgamma_t *table;
NSTimeInterval start, current; NSTimeInterval start, current;
float time; float time;
@ -261,7 +260,6 @@ void Sys_FadeScreen(CGDirectDisplayID display)
{ {
CGDisplayCount displayIndex; CGDisplayCount displayIndex;
glwgamma_t *table; glwgamma_t *table;
int stepIndex;
if (!glConfig.deviceSupportsGamma) if (!glConfig.deviceSupportsGamma)
return; return;
@ -295,7 +293,6 @@ void Sys_FadeScreen(CGDirectDisplayID display)
void Sys_UnfadeScreens() void Sys_UnfadeScreens()
{ {
CGDisplayCount displayIndex; CGDisplayCount displayIndex;
int stepIndex;
glwgamma_t *table; glwgamma_t *table;
NSTimeInterval start, current; NSTimeInterval start, current;
float time; float time;
@ -323,7 +320,6 @@ void Sys_UnfadeScreens()
void Sys_UnfadeScreen(CGDirectDisplayID display, glwgamma_t *table) void Sys_UnfadeScreen(CGDirectDisplayID display, glwgamma_t *table)
{ {
CGDisplayCount displayIndex; CGDisplayCount displayIndex;
int stepIndex;
if (!glConfig.deviceSupportsGamma) if (!glConfig.deviceSupportsGamma)
return; return;

2
code/macosx/macosx_glsmp_mutex.m
View file

@ -84,7 +84,7 @@ qboolean GLimp_SpawnRenderThread( void (*function)( void ) )
// The command buffer returned might be NULL, indicating that the rendering thread should exit. // The command buffer returned might be NULL, indicating that the rendering thread should exit.
void *GLimp_RendererSleep(void) void *GLimp_RendererSleep(void)
{ {
void *data; volatile void *data;
GLSTAMP("GLimp_RendererSleep start", 0); GLSTAMP("GLimp_RendererSleep start", 0);

6
code/macosx/macosx_sys.m
View file

@ -85,8 +85,8 @@ extern char *FS_BuildOSPath( const char *base, const char *game, const char *qp
void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPoint)(long, ...), void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPoint)(long, ...),
long (QDECL *systemcalls)(long, ...) ) { long (QDECL *systemcalls)(long, ...) ) {
void *libHandle; void *libHandle;
void (*dllEntry)( int (*syscallptr)(int, ...) ); void (*dllEntry)( long (*syscallptr)(long, ...) );
NSString *bundlePath, *libraryPath; NSString *libraryPath;
const char *path; const char *path;
// TTimo // TTimo
@ -320,7 +320,7 @@ qboolean Sys_ObjectIsCDRomDevice(io_object_t object)
{ {
CFStringRef value; CFStringRef value;
kern_return_t krc; kern_return_t krc;
CFDictionaryRef properties; CFMutableDictionaryRef properties;
qboolean isCDROM = qfalse; qboolean isCDROM = qfalse;
io_iterator_t parentIterator; io_iterator_t parentIterator;
io_object_t parent; io_object_t parent;