notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added additional search path for magic plugins on Mac OS X.

Browse source
This commit is contained in:
Martin Fuhrer 2007-11-21 07:28:37 +00:00
parent aaadc0d011
commit ca0cb771e5
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tuxpaint.c
View file

@ -904,6 +904,9 @@ static int num_magics; // How many magic tools were loaded (note: shared objs ma
enum { enum {
MAGIC_PLACE_GLOBAL, MAGIC_PLACE_GLOBAL,
MAGIC_PLACE_LOCAL, MAGIC_PLACE_LOCAL,
#ifdef __APPLE__
MAGIC_PLACE_ALLUSERS,
#endif
NUM_MAGIC_PLACES NUM_MAGIC_PLACES
}; };
@ -6125,20 +6128,19 @@ static void setup(int argc, char *argv[])
savedir = strdup("./userdata"); savedir = strdup("./userdata");
datadir = strdup("./userdata"); datadir = strdup("./userdata");
#elif __APPLE__
/* Mac OS X */
savedir = strdup(macosx.preferencesPath);
datadir = strdup(macosx.preferencesPath);
#else #else
/* Mac OS X & Linux */ /* Linux */
if (getenv("HOME") != NULL) if (getenv("HOME") != NULL)
{ {
char tmp[MAX_PATH]; char tmp[MAX_PATH];
snprintf(tmp, MAX_PATH, "%s/%s", getenv("HOME"), snprintf(tmp, MAX_PATH, "%s/%s", getenv("HOME"), ".tuxpaint");
#ifdef __APPLE__
"Library/Application Support/TuxPaint"
#else
".tuxpaint"
#endif
);
savedir = strdup(tmp); savedir = strdup(tmp);
datadir = strdup(tmp); datadir = strdup(tmp);
@ -6203,7 +6205,7 @@ static void setup(int argc, char *argv[])
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */ /* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */
snprintf(str, sizeof(str), "%s/TuxPaint/tuxpaint.cfg", macosx.preferencesPath); snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macosx.preferencesPath);
#else #else
/* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */ /* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */
@ -16703,6 +16705,10 @@ void load_magic_plugins(void)
place = strdup(MAGIC_PREFIX); place = strdup(MAGIC_PREFIX);
else if (plc == MAGIC_PLACE_LOCAL) else if (plc == MAGIC_PLACE_LOCAL)
place = get_fname("plugins/", DIR_DATA); place = get_fname("plugins/", DIR_DATA);
#ifdef __APPLE__
else if (plc == MAGIC_PLACE_ALLUSERS)
place = strdup("/Library/Application Support/TuxPaint/plugins/");
#endif
else else
continue; // Huh? continue; // Huh?
@ -16727,6 +16733,10 @@ void load_magic_plugins(void)
magic_api_struct[plc]->data_directory = strdup(DATA_PREFIX); magic_api_struct[plc]->data_directory = strdup(DATA_PREFIX);
else if (plc == MAGIC_PLACE_LOCAL) else if (plc == MAGIC_PLACE_LOCAL)
magic_api_struct[plc]->data_directory = get_fname("plugins/data/", DIR_DATA); magic_api_struct[plc]->data_directory = get_fname("plugins/data/", DIR_DATA);
#ifdef __APPLE__
else if (plc == MAGIC_PLACE_ALLUSERS)
magic_api_struct[plc]->data_directory = strdup("/Library/Application Support/TuxPaint/plugins/data");
#endif
else else
magic_api_struct[plc]->data_directory = strdup("./"); magic_api_struct[plc]->data_directory = strdup("./");