liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac: set config path in options.cc

Browse Source
This commit is contained in:
Richard Barber
2020-02-16 20:21:07 -08:00
parent 8b1438f23d
commit d8d96784a4
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/options.cc
View File

@@ -2270,7 +2270,11 @@ void Options::load(bool lightweight)
const gchar* path; const gchar* path;
Glib::ustring dPath; Glib::ustring dPath;
#ifdef __APPLE__
path = g_getenv("HOME") + "Library/Application Support/RawTherapee/config";
#else
path = g_getenv("RT_SETTINGS"); path = g_getenv("RT_SETTINGS");
#endif
if (path != nullptr) { if (path != nullptr) {
rtdir = Glib::ustring(path); rtdir = Glib::ustring(path);

8
tools/osx/Info.plist.in
View File

@@ -30,13 +30,13 @@
<string>similar</string> <string>similar</string>
<key>GTK_OVERLAY_SCROLLING</key> <key>GTK_OVERLAY_SCROLLING</key>
<string>0</string> <string>0</string>
<key>RT_SETTINGS</key>
<string>~/Library/Application Support/RawTherapee/config</string>
<key>RT_CACHE</key>
<string>~/Library/Application Support/RawTherapee/cache</string>
</dict> </dict>
<key>ATSApplicationFontsPath</key> <key>ATSApplicationFontsPath</key>
<string>etc/fonts</string> <string>etc/fonts</string>
<key>LSMultipleInstancesProhibited</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>@minimum_macos_version@</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>

1
tools/osx/macosx_bundle.sh
View File

@@ -104,6 +104,7 @@ GTK_PREFIX: ${GTK_PREFIX}
PWD: ${PWD} PWD: ${PWD}
__EOS__ __EOS__
minimum_macos_version=${MINIMUM_SYSTEM_VERSION}
LOCAL_PREFIX="$(cmake .. -LA -N | grep "LOCAL_PREFIX" | cut -d "=" -f2)" LOCAL_PREFIX="$(cmake .. -LA -N | grep "LOCAL_PREFIX" | cut -d "=" -f2)"
EXPATLIB="$(cmake .. -LA -N | grep "pkgcfg_lib_EXPAT_expat" | cut -d "=" -f2)" EXPATLIB="$(cmake .. -LA -N | grep "pkgcfg_lib_EXPAT_expat" | cut -d "=" -f2)"