Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4574757e0ae13e522f611aa7ee6870e594b53c42..544045bcb555e528156d01954ee1b7cad7b19b1f 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -364,7 +364,17 @@ dcpomatic_setup ()
 #ifdef DCPOMATIC_WINDOWS
        putenv ("PANGOCAIRO_BACKEND=fontconfig");
        putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str());
+#endif
+
+#ifdef DCPOMATIC_OSX
+       setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1);
+       setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1);
+#endif
 
+       Pango::init ();
+       dcp::init ();
+
+#ifdef DCPOMATIC_WINDOWS
        /* Render something to fontconfig to create its cache */
        list<StringText> subs;
        dcp::SubtitleString ss(
@@ -375,9 +385,6 @@ dcpomatic_setup ()
        render_text (subs, list<shared_ptr<Font> >(), dcp::Size(640, 480), DCPTime(), 24);
 #endif
 
-       Pango::init ();
-       dcp::init ();
-
        Ratio::setup_ratios ();
        PresetColourConversion::setup_colour_conversion_presets ();
        VideoContentScale::setup_scales ();