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

4
code/qcommon/files.c
View file

@ -246,7 +246,7 @@ static char fs_gamedir[MAX_OSPATH]; // this will be a single file name with no
static cvar_t *fs_debug;
static cvar_t *fs_homepath;
#ifdef MACOS_X
#ifdef __APPLE__
// Also search the .app bundle for .pk3 files
static cvar_t *fs_apppath;
#endif
@ -3319,7 +3319,7 @@ static void FS_Startup( const char *gameName )
}
// fs_homepath is somewhat particular to *nix systems, only add if relevant
#ifdef MACOS_X
#ifdef __APPLE__
fs_apppath = Cvar_Get ("fs_apppath", Sys_DefaultAppPath(), CVAR_INIT|CVAR_PROTECTED );
// Make MacOSX also include the base path included with the .app bundle
if (fs_apppath->string[0])