ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-02 00:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

lottie: rename lottie-player to rlottie in meson build

Browse Source 
Change-Id: Ie19ea2d849af95b348417e826dcc2fb7e6ded86b
This commit is contained in:
sub.mohanty@samsung.com
2019-01-19 09:22:16 +09:00
committed by subhransu mohanty
parent aebcc6ab49
commit 04a4bec5bb
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
example/meson.build
View File

@@ -16,7 +16,7 @@ if (demo_dep.found())
executable('demo',
demo_sources,
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : demo_dep)
lottieview_test_src = files('lottieviewtest.cpp')
@@ -25,7 +25,7 @@ if (demo_dep.found())
executable('lottieviewTest',
lottieview_test_src,
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : demo_dep)
uxsample_test_src = files('uxsampletest.cpp')
@@ -34,7 +34,7 @@ if (demo_dep.found())
executable('uxsampleTest',
uxsample_test_src,
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : demo_dep)
lottieviewer_sources = files('lottieviewer.cpp')
@@ -43,14 +43,14 @@ if (demo_dep.found())
executable('lottieviewer',
lottieviewer_sources,
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : demo_dep)
if (meson.get_compiler('cpp').has_header('elementary-1/elm_animation_view.h'))
executable('efl_animview',
'efl_animview.cpp',
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : demo_dep)
endif

12
meson.build
View File

@@ -1,8 +1,8 @@
project('lottie-player library',
project('rlottie library',
'cpp',
license : 'Apache')
lottie_player_lib_version = '0.0.1'
rlottie_lib_version = '0.0.1'
add_global_arguments('-DDEMO_DIR="@0@/example/resource/"'.format(meson.current_source_dir()), language : 'cpp')
@@ -46,9 +46,9 @@ endif
pkg_mod = import('pkgconfig')
pkg_mod.generate( libraries : lottie_player_lib,
version : lottie_player_lib_version,
name : 'liblottie-player',
filebase : 'lottie-player',
pkg_mod.generate( libraries : rlottie_lib,
version : rlottie_lib_version,
name : 'librlottie',
filebase : 'rlottie',
description : 'A Library for rendering lottie files.'
)

12
src/meson.build
View File

@@ -6,9 +6,9 @@ library_deps = vector_dep
library_deps += lottie_dep
library_deps += binding_dep
lottie_player_lib = shared_library( 'lottie-player',
include_directories : inc,
version : lottie_player_lib_version,
dependencies : library_deps,
install : true
)
rlottie_lib = shared_library('rlottie',
include_directories : inc,
version : rlottie_lib_version,
dependencies : library_deps,
install : true
)

9
src/vector/stb/meson.build
View File

@@ -1,7 +1,8 @@
lottie_image_loader_sources = ['stb_image.cpp']
rlottie_image_loader_sources = ['stb_image.cpp']
lottie_image_loader_lib = shared_library( 'lottie-image-loader',
lottie_image_loader_sources,
install : true)
rlottie_image_loader_lib = shared_library('rlottie-image-loader',
rlottie_image_loader_sources,
install : true
)

10
src/vector/vimageloader.cpp
View File

@@ -15,18 +15,18 @@ struct VImageLoader::Impl
Impl()
{
#ifdef __APPLE__
dl_handle = dlopen("liblottie-image-loader.dylib", RTLD_LAZY);
dl_handle = dlopen("librlottie-image-loader.dylib", RTLD_LAZY);
#else
dl_handle = dlopen("liblottie-image-loader.so", RTLD_LAZY);
dl_handle = dlopen("librlottie-image-loader.so", RTLD_LAZY);
#endif
if (!dl_handle)
vWarning<<"Failed to dlopen liblottie-image-loader library";
vWarning<<"Failed to dlopen librlottie-image-loader library";
lottie_image_load = (lottie_image_load_f) dlsym(dl_handle, "lottie_image_load");
if (!lottie_image_load)
vWarning<<"Failed to find symbol lottie_image_load in liblottie-image-loader library";
vWarning<<"Failed to find symbol lottie_image_load in librlottie-image-loader library";
lottie_image_free = (lottie_image_free_f) dlsym(dl_handle, "lottie_image_free");
if (!lottie_image_free)
vWarning<<"Failed to find symbol lottie_image_free in liblottie-image-loader library";
vWarning<<"Failed to find symbol lottie_image_free in librlottie-image-loader library";
}
~Impl()
{

2
test/meson.build
View File

@@ -19,7 +19,7 @@ animation_test_sources += files('test_lottieanimation_capi.cpp')
animation_testsuite = executable('animationTestSuite',
animation_test_sources,
include_directories : inc,
link_with : lottie_player_lib,
link_with : rlottie_lib,
dependencies : gtest_dep)
test('Animation Testsuite', animation_testsuite)