From 020f550d20404d6e174c7662c9e9997f04022941 Mon Sep 17 00:00:00 2001 From: Karim Naaji Date: Mon, 27 Oct 2014 16:53:03 -0400 Subject: [PATCH] fix missing link with libtess2 static lib --- build/toolchains/android.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/toolchains/android.cmake b/build/toolchains/android.cmake index 0cf0ea035d..01f5e38289 100644 --- a/build/toolchains/android.cmake +++ b/build/toolchains/android.cmake @@ -28,6 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pedantic -llog -lz") set(CXX_FLAGS_DEBUG "${CXX_FLAGS_DEBUG} -g -O0") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -fPIC") set(LIBCURL_PRECOMPILED_LIB ${CMAKE_SOURCE_DIR}/android/jni/precompiled/${ANDROID_ABI}/libcurl.a) +set(LIBTESS_PRECOMPILED_LIB ${CMAKE_SOURCE_DIR}/android/jni/precompiled/${ANDROID_ABI}/libtess2.a) # include dependency headers include_directories(${PROJECT_SOURCE_DIR}/android/jni/include) @@ -43,7 +44,7 @@ set(ADDITIONNAL_TARGET_DEPENDENT_SRC_FILES set(INSTALL_CORE_LIBRARY "ON") set(CORE_LIB_TYPE SHARED) set(CORE_INSTALLATION_PATH ${CMAKE_SOURCE_DIR}/android/libs/${ANDROID_ABI}) -set(CORE_LIB_DEPS GLESv2 ${LIBCURL_PRECOMPILED_LIB}) +set(CORE_LIB_DEPS GLESv2 ${LIBCURL_PRECOMPILED_LIB} ${LIBTESS_PRECOMPILED_LIB}) set(CORE_LIB_NAME tangram) # in order to have libtangram.so include_directories(${PROJECT_SOURCE_DIR}/core/include/)