disable the emoji support now

frinkr · Sep 2, 2017 · d3bd179 · d3bd179
1 parent 6a361d7
commit d3bd179
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11")
 
 if(BUILD_FREETYPE_HARFBUZZ)
   set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_SOURCE_DIR}/pkgconfig")
-  option(WITH_PNG "Freetype: Build with PNG" ON)
+  option(WITH_PNG "Freetype: Build with PNG" OFF)
   add_subdirectory(harfbuzz-icu-freetype)
 endif()
 

diff --git a/font-tool/Typeface.mm b/font-tool/Typeface.mm
@@ -13,8 +13,8 @@
 #include FT_SIZES_H
 #include FT_MULTIPLE_MASTERS_H
 
-#ifndef FT_CONFIG_OPTION_USE_PNG
-#error "Enable PNG to use colour fonts"
+#if !defined(FT_CONFIG_OPTION_USE_PNG) || !defined(TT_CONFIG_OPTION_EMBEDDED_BITMAPS)
+#warning "Enable PNG & embedded bitmap to use colour fonts"
 #endif
 
 static int FT_DEFAULT_FONTSIZE = 24 * 4;