From e9a5a20870bb925cec56635d6deb4444b07d4aed Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 3 Jul 2006 07:31:55 +0000 Subject: [PATCH] fix issue with DP_FS_BASEDIR on Mac git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6496 d7cf8633-e32d-0410-b094-e92efae38249 --- fs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs.c b/fs.c index f982e226..ab981f5e 100644 --- a/fs.c +++ b/fs.c @@ -1066,13 +1066,13 @@ void FS_Init (void) // If the base directory is explicitly defined by the compilation process #ifdef DP_FS_BASEDIR strcpy(fs_basedir, DP_FS_BASEDIR); - #else strcpy(fs_basedir, ""); +#endif #ifdef MACOSX // FIXME: is there a better way to find the directory outside the .app? - if (strstr(com_argv[0], ".app/")) + if (!fs_basedir[0] && strstr(com_argv[0], ".app/")) { char *split; @@ -1082,7 +1082,6 @@ void FS_Init (void) strlcpy(fs_basedir, com_argv[0], sizeof(fs_basedir)); fs_basedir[split - com_argv[0]] = 0; } -#endif #endif PK3_OpenLibrary (); -- 2.39.2