@@ -78,10 +78,64 @@ target_include_directories(tgnet PUBLIC
7878target_link_libraries (tgnet
7979 crypto )
8080
81- # tlottie (prebuilt Rust static library)
82- add_library (tlottie STATIC IMPORTED )
83- set_target_properties (tlottie PROPERTIES
84- IMPORTED_LOCATION ${CMAKE_HOME_DIRECTORY } /tlottie_lib/${ANDROID_ABI} /libtlottie.a)
81+ #rlottie
82+ add_library (rlottie STATIC
83+ rlottie/src/lottie/lottieanimation.cpp
84+ rlottie/src/lottie/lottieitem.cpp
85+ rlottie/src/lottie/lottiekeypath.cpp
86+ rlottie/src/lottie/lottieloader.cpp
87+ rlottie/src/lottie/lottiemodel.cpp
88+ rlottie/src/lottie/lottieparser.cpp
89+ rlottie/src/lottie/lottieproxymodel.cpp
90+ rlottie/src/vector/freetype/v_ft_math.cpp
91+ rlottie/src/vector/freetype/v_ft_raster.cpp
92+ rlottie/src/vector/freetype/v_ft_stroker.cpp
93+ rlottie/src/vector/pixman/vregion.cpp
94+ rlottie/src/vector/stb/stb_image.cpp
95+ rlottie/src/vector/vbezier.cpp
96+ rlottie/src/vector/vbitmap.cpp
97+ rlottie/src/vector/vbrush.cpp
98+ rlottie/src/vector/vcompositionfunctions.cpp
99+ rlottie/src/vector/vdasher.cpp
100+ rlottie/src/vector/vdebug.cpp
101+ rlottie/src/vector/vdrawable.cpp
102+ rlottie/src/vector/vdrawhelper.cpp
103+ rlottie/src/vector/vdrawhelper_neon.cpp
104+ rlottie/src/vector/velapsedtimer.cpp
105+ rlottie/src/vector/vimageloader.cpp
106+ rlottie/src/vector/vinterpolator.cpp
107+ rlottie/src/vector/vmatrix.cpp
108+ rlottie/src/vector/vpainter.cpp
109+ rlottie/src/vector/vpath.cpp
110+ rlottie/src/vector/vpathmesure.cpp
111+ rlottie/src/vector/vraster.cpp
112+ rlottie/src/vector/vrect.cpp
113+ rlottie/src/vector/vrle.cpp )
114+ target_compile_options (rlottie PUBLIC
115+ -Wall -fno-rtti -finline-functions -ffast-math -Oz -fno-unwind-tables -fno-asynchronous-unwind-tables -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -fvisibility=hidden )
116+ set_target_properties (rlottie PROPERTIES
117+ ANDROID_ARM_MODE arm)
118+ target_compile_definitions (rlottie PUBLIC
119+ HAVE_PTHREAD NDEBUG )
120+ target_include_directories (rlottie PUBLIC
121+ ./
122+ rlottie/inc
123+ rlottie/src/vector/
124+ rlottie/src/vector/pixman
125+ rlottie/src/vector/freetype
126+ rlottie/src/vector/stb )
127+
128+ if (${ANDROID_ABI} STREQUAL "armeabi-v7a" )
129+ target_compile_definitions (rlottie PUBLIC
130+ USE_ARM_NEON )
131+ target_sources (rlottie PRIVATE
132+ rlottie/src/vector/pixman/pixman-arm-neon-asm.S )
133+ elseif (${ANDROID_ABI} STREQUAL "arm64-v8a" )
134+ target_compile_definitions (rlottie PUBLIC
135+ USE_ARM_NEON __ARM64_NEON__ )
136+ target_sources (rlottie PRIVATE
137+ rlottie/src/vector/pixman/pixman-arma64-neon-asm.S )
138+ endif ()
85139
86140#sqlite
87141add_library (sqlite STATIC
@@ -411,7 +465,6 @@ target_include_directories(${NATIVE_LIB} PUBLIC
411465 emoji
412466 exoplayer/include
413467 intro
414- tlottie/include
415468 tgcalls/
416469 webrtc/
417470 tde2e/include
@@ -426,7 +479,7 @@ target_link_libraries(${NATIVE_LIB}
426479 tgcalls
427480 tgcalls_tp
428481 tgnet
429- tlottie
482+ rlottie
430483 sqlite
431484 swscale
432485 avformat
0 commit comments