disable custom font loading on OSX

git-svn-id: svn://localhost/ardour2/branches/3.0@14093 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 850b1141d13c6ace0c2b183af4e85d83ea3e8a4d..e53df29e2168fbd09abb29065319c79d849f1e58 100644 (file)
--- 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