[quake3-commits] r1775 - in trunk: . code/qcommon code/sys
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Feb 26 11:32:49 EST 2010
Author: tma
Date: 2010-02-26 11:32:49 -0500 (Fri, 26 Feb 2010)
New Revision: 1775
Modified:
trunk/Makefile
trunk/code/qcommon/q_platform.h
trunk/code/sys/sys_osx.m
Log:
* Fix a memory leak in OS X Sys_Dialog
* Fix compilation on Snow Leopard
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-02-16 09:43:44 UTC (rev 1774)
+++ trunk/Makefile 2010-02-26 16:32:49 UTC (rev 1775)
@@ -1113,7 +1113,7 @@
# QVM BUILD TOOLS
#############################################################################
-TOOLS_OPTIMIZE = -g -O2 -Wall -fno-strict-aliasing
+TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing
TOOLS_CFLAGS += $(TOOLS_OPTIMIZE) \
-DTEMPDIR=\"$(TEMPDIR)\" -DSYSTEM=\"\" \
-I$(Q3LCCSRCDIR) \
Modified: trunk/code/qcommon/q_platform.h
===================================================================
--- trunk/code/qcommon/q_platform.h 2010-02-16 09:43:44 UTC (rev 1774)
+++ trunk/code/qcommon/q_platform.h 2010-02-26 16:32:49 UTC (rev 1775)
@@ -119,6 +119,9 @@
#elif defined __i386__
#define ARCH_STRING "i386"
#define Q3_LITTLE_ENDIAN
+#elif defined __x86_64__
+#define ARCH_STRING "x86_64"
+#define Q3_LITTLE_ENDIAN
#endif
#define DLL_EXT ".dylib"
Modified: trunk/code/sys/sys_osx.m
===================================================================
--- trunk/code/sys/sys_osx.m 2010-02-16 09:43:44 UTC (rev 1774)
+++ trunk/code/sys/sys_osx.m 2010-02-26 16:32:49 UTC (rev 1775)
@@ -41,19 +41,19 @@
*/
const char *Sys_TempPath( void )
{
- static UInt8 posixPath[ MAX_OSPATH ];
- FSRef ref;
- if( FSFindFolder( kOnAppropriateDisk,
- kTemporaryFolderType, kCreateFolder, &ref ) == noErr )
- {
- if( FSRefMakePath( &ref, posixPath,
- sizeof( posixPath ) - 1 ) == noErr )
- {
- return (const char *)posixPath;
- }
- }
+ static UInt8 posixPath[ MAX_OSPATH ];
+ FSRef ref;
+ if( FSFindFolder( kOnAppropriateDisk,
+ kTemporaryFolderType, kCreateFolder, &ref ) == noErr )
+ {
+ if( FSRefMakePath( &ref, posixPath,
+ sizeof( posixPath ) - 1 ) == noErr )
+ {
+ return (const char *)posixPath;
+ }
+ }
- return "/tmp";
+ return "/tmp";
}
/*
@@ -65,43 +65,51 @@
*/
dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *title )
{
- NSAlert* alert = [NSAlert new];
-
+ dialogResult_t result = DR_OK;
+ NSAlert *alert = [NSAlert new];
+
[alert setMessageText: [NSString stringWithUTF8String: title]];
[alert setInformativeText: [NSString stringWithUTF8String: message]];
-
+
if( type == DT_ERROR )
[alert setAlertStyle: NSCriticalAlertStyle];
else
[alert setAlertStyle: NSWarningAlertStyle];
-
+
switch( type )
{
default:
[alert runModal];
- return DR_OK;
-
+ result = DR_OK;
+ break;
+
case DT_YES_NO:
[alert addButtonWithTitle: @"Yes"];
[alert addButtonWithTitle: @"No"];
switch( [alert runModal] )
{
default:
- case NSAlertFirstButtonReturn: return DR_YES;
- case NSAlertSecondButtonReturn: return DR_NO;
+ case NSAlertFirstButtonReturn: result = DR_YES; break;
+ case NSAlertSecondButtonReturn: result = DR_NO; break;
}
-
+ break;
+
case DT_OK_CANCEL:
[alert addButtonWithTitle: @"OK"];
[alert addButtonWithTitle: @"Cancel"];
-
+
switch( [alert runModal] )
{
default:
- case NSAlertFirstButtonReturn: return DR_OK;
- case NSAlertSecondButtonReturn: return DR_CANCEL;
+ case NSAlertFirstButtonReturn: result = DR_OK; break;
+ case NSAlertSecondButtonReturn: result = DR_CANCEL; break;
}
+ break;
}
+
+ [alert release];
+
+ return result;
}
/*
More information about the quake3-commits
mailing list