From 58edf10f5b07ac0e3c2536ed5e3a3bb996c8fc31 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 7 Nov 2017 23:03:08 +0100 Subject: [PATCH] removed unneeded reference to app bundle directory for Mac OS X --- src/libgame/misc.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 3ff1f8aa..b1d0d96b 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -701,36 +701,13 @@ static char *getProgramMainDataPath() char *main_data_path = getStringCopy(program.command_basepath); #if defined(PLATFORM_MACOSX) - static char *main_data_binary_subdir = NULL; - static char *main_data_files_subdir = NULL; - - if (main_data_binary_subdir == NULL) - { - main_data_binary_subdir = checked_malloc(strlen(program.program_title) + 1 + - strlen("app") + 1 + - strlen(MAC_APP_BINARY_SUBDIR) + 1); - - sprintf(main_data_binary_subdir, "%s.app/%s", - program.program_title, MAC_APP_BINARY_SUBDIR); - } - - if (main_data_files_subdir == NULL) - { - main_data_files_subdir = checked_malloc(strlen(program.program_title) + 1 + - strlen("app") + 1 + - strlen(MAC_APP_FILES_SUBDIR) + 1); - - sprintf(main_data_files_subdir, "%s.app/%s", - program.program_title, MAC_APP_FILES_SUBDIR); - } - - if (strSuffix(main_data_path, main_data_binary_subdir)) + if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR)) { char *main_data_path_old = main_data_path; // cut relative path to Mac OS X application binary directory from path main_data_path[strlen(main_data_path) - - strlen(main_data_binary_subdir)] = '\0'; + strlen(MAC_APP_BINARY_SUBDIR)] = '\0'; // cut trailing path separator from path (but not if path is root directory) if (strSuffix(main_data_path, "/") && !strEqual(main_data_path, "/")) @@ -741,7 +718,7 @@ static char *getProgramMainDataPath() main_data_path = "."; // add relative path to Mac OS X application resources directory to path - main_data_path = getPath2(main_data_path, main_data_files_subdir); + main_data_path = getPath2(main_data_path, MAC_APP_FILES_SUBDIR); free(main_data_path_old); } -- 2.34.1