From 469b36ad88b7512dc569935f4c3ac0a7a53476df Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Wed, 7 Apr 2021 22:05:52 +0200
Subject: [PATCH] Update path to HarfBuzz 2.8.0
---
Android.mk | 2 +-
CMakeLists.txt | 6 +++---
external/freetype-2.10.4/Android.mk | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Android.mk b/Android.mk
index 2bc36fd..171f74a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@ SDL_TTF_LOCAL_PATH := $(call my-dir)
# Enable this if you want to use HarfBuzz
SUPPORT_HARFBUZZ ?= false
-HARFBUZZ_LIBRARY_PATH := external/harfbuzz-2.3.1
+HARFBUZZ_LIBRARY_PATH := external/harfbuzz-2.8.0
FREETYPE_LIBRARY_PATH := external/freetype-2.10.4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e72c7cf..32aee5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if (ANDROID)
target_sources(SDL2_ttf PRIVATE SDL_ttf.c)
if (TTF_WITH_HARFBUZZ)
- set(HARFBUZZ_INCLUDE_DIRS ../../external/harfbuzz-2.3.1/src)
+ set(HARFBUZZ_INCLUDE_DIRS ../../external/harfbuzz-2.8.0/src)
set(HARFBUZZ_LIBRARIES harfbuzz)
set(FREETYPE_INCLUDE_DIRS ../../external/freetype-2.10.4/include)
set(FREETYPE_LIBRARY freetype)
@@ -24,8 +24,8 @@ if (ANDROID)
set(HB_HAVE_FREETYPE ON CACHE BOOL "" FORCE)
set(FT_WITH_HARFBUZZ ON CACHE BOOL "" FORCE)
- add_subdirectory(external/harfbuzz-2.3.1)
- target_include_directories(SDL2_ttf PUBLIC external/harfbuzz-2.3.1/src)
+ add_subdirectory(external/harfbuzz-2.8.0)
+ target_include_directories(SDL2_ttf PUBLIC external/harfbuzz-2.8.0/src)
target_link_libraries(SDL2_ttf PRIVATE harfbuzz)
else()
diff --git a/external/freetype-2.10.4/Android.mk b/external/freetype-2.10.4/Android.mk
index 87ea2a5..c13e86f 100644
--- a/external/freetype-2.10.4/Android.mk
+++ b/external/freetype-2.10.4/Android.mk
@@ -53,7 +53,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
SUPPORT_HARFBUZZ ?= false
ifeq ($(SUPPORT_HARFBUZZ),true)
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../harfbuzz-2.3.1/src/
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../harfbuzz-2.8.0/src/
LOCAL_CFLAGS += -DFT_CONFIG_OPTION_USE_HARFBUZZ
endif