Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/fontconfig/config/mac/config.h.template

Issue 113203003: Fix Mac fontconfig build (Closed) Base URL: https://skia.googlesource.com/skia.git@noembed
Patch Set: checkpoint Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/fontconfig/README.chromium ('K') | « third_party/fontconfig/config/mac/config.h ('k') | third_party/fontconfig/process-template.py » ('j') | third_party/fontconfig/process-template.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/fontconfig/config/mac/config.h.template
diff --git a/third_party/fontconfig/config/mac/config.h b/third_party/fontconfig/config/mac/config.h.template
similarity index 98%
rename from third_party/fontconfig/config/mac/config.h
rename to third_party/fontconfig/config/mac/config.h.template
index 963ede849453d4c8f63194e7e43c97ff907ae12c..3eea946a19b39d9ef4a2df3bb02e4df90d51d459 100644
--- a/third_party/fontconfig/config/mac/config.h
+++ b/third_party/fontconfig/config/mac/config.h.template
@@ -1,6 +1,10 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Manually added template defines */
+#define FC_CACHEDIR "@FC_CACHEDIR@"
+#define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
+
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -11,7 +15,7 @@
/* #undef ENABLE_LIBXML2 */
/* Additional font directories */
-#define FC_ADD_FONTS "yes"
+#define FC_ADD_FONTS "/System/Library/Fonts,/Library/Fonts"
/* Architecture prefix to use for cache file names */
/* #undef FC_ARCHITECTURE */
« third_party/fontconfig/README.chromium ('K') | « third_party/fontconfig/config/mac/config.h ('k') | third_party/fontconfig/process-template.py » ('j') | third_party/fontconfig/process-template.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698