Skip to content

Commit

Permalink
Fix paths to freetype-2.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
1bsyl committed Feb 12, 2020
1 parent dba5791 commit 9190c1f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -16,7 +16,7 @@ if (ANDROID)
if (TTF_WITH_HARFBUZZ)
set(HARFBUZZ_INCLUDE_DIRS ../../external/harfbuzz-2.3.1/src)
set(HARFBUZZ_LIBRARIES harfbuzz)
set(FREETYPE_INCLUDE_DIRS ../../external/freetype-2.9.1/include)
set(FREETYPE_INCLUDE_DIRS ../../external/freetype-2.10.1/include)
set(FREETYPE_LIBRARY freetype)

add_definitions("-DTTF_USE_HARFBUZZ=1")
Expand All @@ -32,8 +32,8 @@ if (ANDROID)
set(FT_WITH_HARFBUZZ OFF CACHE BOOL "" FORCE)
endif()

add_subdirectory(external/freetype-2.9.1)
include_directories(external/freetype-2.9.1/include)
add_subdirectory(external/freetype-2.10.1)
include_directories(external/freetype-2.10.1/include)

target_include_directories(SDL2_ttf PUBLIC .)
target_link_libraries(SDL2_ttf PRIVATE freetype SDL2)
Expand Down
2 changes: 1 addition & 1 deletion external/harfbuzz-2.3.1/Android.mk
Expand Up @@ -57,7 +57,7 @@ LOCAL_C_INCLUDES = \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/src/ \
$(LOCAL_PATH)/src/hb-ucdn/ \
$(LOCAL_PATH)/../freetype-2.9.1/include/ \
$(LOCAL_PATH)/../freetype-2.10.1/include/ \


#LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -fPIC
Expand Down

0 comments on commit 9190c1f

Please sign in to comment.