Merge branch 'master' into sdl2.0

2021-03-23 21:22:12 -04:00 · 2021-03-23 21:22:12 -04:00 · c3cce36fc0
commit c3cce36fc0
parent b27ac1ddbc 4575f184a5
27 changed files with 219 additions and 327 deletions
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@ -23957,10 +23957,11 @@ static void setup_config(char *argv[])
      /* FIXME: Need assist for:
         * __BEOS__
         * __HAIKU__
-         * __APPLE__
      */
 #ifdef WIN32
      picturesdir = GetUserImageDir();
+#elif __APPLE__
+      picturesdir = apple_picturesPath();
 #else
      picturesdir = get_xdg_user_dir("PICTURES", "Pictures");
 #endif