diff options
| author | Robin Gareus <robin@gareus.org> | 2013-02-23 01:55:06 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-02-23 01:55:06 +0000 |
| commit | 2865bcddd565279008fa67f28cd5afca384d10df (patch) | |
| tree | 1e8b24a0e3bba26dbbc2618c96e77cccbd32d00f /gtk2_ardour | |
| parent | bfb56b70b831e0f1bc6533de54433bdb9852d3ff (diff) | |
disable custom font loading on OSX
git-svn-id: svn://localhost/ardour2/branches/3.0@14093 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/main.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 850b1141d1..e53df29e21 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -60,7 +60,7 @@ #include "i18n.h" -#ifdef __APPLE__ +#if (defined __APPLE__ && defined OSX_CUSTOM_FONT) #include <Carbon/Carbon.h> #endif @@ -222,6 +222,7 @@ fixup_bundle_environment (int, char* []) } static void load_custom_fonts() { +#ifdef OSX_CUSTOM_FONT std::string ardour_mono_file; if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) { @@ -239,6 +240,7 @@ static void load_custom_fonts() { if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) { cerr << _("Cannot load ArdourMono TrueType font.") << endl; } +#endif } #else |