okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Makefile for OSX

Browse source 
Bump base SDK from 10.5 -> 10.7
Just use the builtin __APPLE__
This commit is contained in:
Victor Roemer 2016-06-12 17:06:54 -04:00
parent a40588c8b9
commit 398dea397c
22 changed files with 39 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/sys/sys_local.h
View file

@ -44,7 +44,7 @@ unsigned int CON_LogSize( void );
unsigned int CON_LogWrite( const char *in );
unsigned int CON_LogRead( char *out, unsigned int outSize );
#ifdef MACOS_X
#ifdef __APPLE__
char *Sys_StripAppBundle( char *pwd );
#endif

4
code/sys/sys_main.c
View file

@ -565,7 +565,7 @@ void Sys_ParseArgs( int argc, char **argv )
}
#ifndef DEFAULT_BASEDIR
# ifdef MACOS_X
# ifdef __APPLE__
# define DEFAULT_BASEDIR Sys_StripAppBundle(Sys_BinaryPath())
# else
# define DEFAULT_BASEDIR Sys_BinaryPath()
@ -646,7 +646,7 @@ int main( int argc, char **argv )
// Set the initial time base
Sys_Milliseconds( );
#ifdef MACOS_X
#ifdef __APPLE__
// This is passed if we are launched by double-clicking
if ( argc >= 2 && Q_strncmp ( argv[1], "-psn", 4 ) == 0 )
argc = 1;

2
code/sys/sys_osx.m
View file

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
#ifndef MACOS_X
#ifndef __APPLE__
#error This file is for Mac OS X only. You probably should not compile it.
#endif

6
code/sys/sys_unix.c
View file

@ -61,7 +61,7 @@ char *Sys_DefaultHomePath(void)
if( ( p = getenv( "HOME" ) ) != NULL )
{
Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
#ifdef MACOS_X
#ifdef __APPLE__
Q_strcat(homePath, sizeof(homePath),
"Library/Application Support/");
@ -94,7 +94,7 @@ char *Sys_SteamPath( void )
if( ( p = getenv( "HOME" ) ) != NULL )
{
#ifdef MACOS_X
#ifdef __APPLE__
char *steamPathEnd = "/Library/Application Support/Steam/SteamApps/common/" STEAMPATH_NAME;
#else
char *steamPathEnd = "/.steam/steam/SteamApps/common/" STEAMPATH_NAME;
@ -577,7 +577,7 @@ void Sys_ErrorDialog( const char *error )
close( f );
}
#ifndef MACOS_X
#ifndef __APPLE__
static char execBuffer[ 1024 ];
static char *execBufferPointer;
static char *execArgv[ 16 ];