Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
fef5dd9a
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
接近 2 年 前同步成功
通知
1
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
fef5dd9a
编写于
3月 12, 2016
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #232 from c0nk/wip-icu
Add --with-icu=builtin option; fix compile error
上级
01ea9eaa
5f995db1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
14 deletion
+27
-14
configure.ac
configure.ac
+19
-14
src/Makefile.am
src/Makefile.am
+7
-0
src/hb-icu.cc
src/hb-icu.cc
+1
-0
未找到文件。
configure.ac
浏览文件 @
fef5dd9a
...
...
@@ -197,17 +197,6 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
AM_CONDITIONAL([HAVE_INTROSPECTION], false)
])
dnl ===========================================================================
have_ucdn=true
if $have_glib; then
have_ucdn=false
fi
if $have_ucdn; then
AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions])
fi
AM_CONDITIONAL(HAVE_UCDN, $have_ucdn)
dnl ==========================================================================
AC_ARG_WITH(cairo,
...
...
@@ -256,11 +245,11 @@ AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig)
dnl ==========================================================================
AC_ARG_WITH(icu,
[AS_HELP_STRING([--with-icu=@<:@yes/no/auto@:>@],
[AS_HELP_STRING([--with-icu=@<:@yes/no/
builtin/
auto@:>@],
[Use ICU @<:@default=auto@:>@])],,
[with_icu=auto])
have_icu=false
if test "x$with_icu" = "xyes" -o "x$with_icu" = "xauto"; then
if test "x$with_icu" = "xyes" -o "x$with_icu" = "x
builtin" -o "x$with_icu" = "x
auto"; then
PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, :)
dnl Fallback to icu-config if ICU pkg-config files could not be found
...
...
@@ -282,14 +271,30 @@ if test "x$with_icu" = "xyes" -o "x$with_icu" = "xauto"; then
fi
fi
fi
if test
"x$with_icu" = "xyes"
-a "x$have_icu" != "xtrue"; then
if test
\( "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" \)
-a "x$have_icu" != "xtrue"; then
AC_MSG_ERROR([icu support requested but icu-uc not found])
fi
if $have_icu; then
CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`"
AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
if test "x$with_icu" = "xbuiltin"; then
AC_DEFINE(HAVE_ICU_BUILTIN, 1, [Use hb-icu Unicode callbacks])
fi
fi
AM_CONDITIONAL(HAVE_ICU, $have_icu)
AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin")
dnl ===========================================================================
have_ucdn=true
if $have_glib || $have_icu && test "x$with_icu" = "xbuiltin"; then
have_ucdn=false
fi
if $have_ucdn; then
AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions])
fi
AM_CONDITIONAL(HAVE_UCDN, $have_ucdn)
dnl ==========================================================================
...
...
src/Makefile.am
浏览文件 @
fef5dd9a
...
...
@@ -147,6 +147,12 @@ EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_la_DEPENDENCIES)
CLEANFILES
+=
libharfbuzz-fuzzing.la
if
HAVE_ICU
if
HAVE_ICU_BUILTIN
HBCFLAGS
+=
$(ICU_CFLAGS)
HBLIBS
+=
$(ICU_LIBS)
HBSOURCES
+=
$(HB_ICU_sources)
HBHEADERS
+=
$(HB_ICU_headers)
else
lib_LTLIBRARIES
+=
libharfbuzz-icu.la
libharfbuzz_icu_la_SOURCES
=
$(HB_ICU_sources)
libharfbuzz_icu_la_CPPFLAGS
=
$(ICU_CFLAGS)
...
...
@@ -155,6 +161,7 @@ libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la
pkginclude_HEADERS
+=
$(HB_ICU_headers)
pkgconfig_DATA
+=
harfbuzz-icu.pc
endif
endif
EXTRA_DIST
+=
harfbuzz-icu.pc.in
if
HAVE_GOBJECT
...
...
src/hb-icu.cc
浏览文件 @
fef5dd9a
...
...
@@ -36,6 +36,7 @@
#include <unicode/uchar.h>
#include <unicode/unorm.h>
#include <unicode/ustring.h>
#include <unicode/utf16.h>
#include <unicode/uversion.h>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录