Merge pull request #279 from PatriceJiang/v3.6.1-fix-ohos-freetype

HarmonyOS fix freetype include path
2022-08-12 11:40:01 +08:00 · 2022-08-12 11:40:01 +08:00 · 5fa7ac1890
parent 9572c7b209 5fe18959ec
commit 5fa7ac1890
51 changed files with 1 additions and 0 deletions
--- a/ohos/CMakeLists.txt
+++ b/ohos/CMakeLists.txt
@ -10,6 +10,7 @@ if (USE_DEBUG_RENDERER)
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
  IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
 )
 endif()

--- a/ohos/arm64-v8a/include/freetype2/freetype/config/ftconfig.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/config/ftconfig.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/config/ftheader.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/config/ftheader.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/config/ftmodule.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/config/ftmodule.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/config/ftoption.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/config/ftoption.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/config/ftstdlib.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/config/ftstdlib.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/freetype.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/freetype.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftadvanc.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftadvanc.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftbbox.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftbbox.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftbdf.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftbdf.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftbitmap.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftbitmap.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftbzip2.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftbzip2.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftcache.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftcache.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftchapters.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftchapters.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftcid.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftcid.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftcolor.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftcolor.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftdriver.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftdriver.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/fterrdef.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/fterrdef.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/fterrors.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/fterrors.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftfntfmt.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftfntfmt.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftgasp.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftgasp.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftglyph.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftglyph.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftgxval.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftgxval.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftgzip.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftgzip.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftimage.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftimage.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftincrem.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftincrem.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftlcdfil.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftlcdfil.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftlist.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftlist.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftlzw.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftlzw.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftmac.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftmac.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftmm.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftmm.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftmodapi.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftmodapi.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftmoderr.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftmoderr.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftotval.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftotval.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftoutln.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftoutln.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftparams.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftparams.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftpfr.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftpfr.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftrender.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftrender.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftsizes.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftsizes.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftsnames.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftsnames.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftstroke.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftstroke.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftsynth.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftsynth.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftsystem.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftsystem.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/fttrigon.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/fttrigon.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/fttypes.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/fttypes.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ftwinfnt.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ftwinfnt.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/t1tables.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/t1tables.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/ttnameid.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/ttnameid.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/tttables.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/tttables.h
--- a/ohos/arm64-v8a/include/freetype2/freetype/tttags.h
+++ b/ohos/arm64-v8a/include/freetype2/freetype/tttags.h
--- a/ohos/arm64-v8a/include/freetype2/ft2build.h
+++ b/ohos/arm64-v8a/include/freetype2/ft2build.h