From 04a4bec5bbbf395f3c7f5e31aa35092a2dcf0d2a Mon Sep 17 00:00:00 2001 From: "sub.mohanty@samsung.com" Date: Sat, 19 Jan 2019 09:22:16 +0900 Subject: [PATCH] lottie: rename lottie-player to rlottie in meson build Change-Id: Ie19ea2d849af95b348417e826dcc2fb7e6ded86b --- example/meson.build | 10 +++++----- meson.build | 12 ++++++------ src/meson.build | 12 ++++++------ src/vector/stb/meson.build | 9 +++++---- src/vector/vimageloader.cpp | 10 +++++----- test/meson.build | 2 +- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/example/meson.build b/example/meson.build index 9a89b60..41c9c96 100644 --- a/example/meson.build +++ b/example/meson.build @@ -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 diff --git a/meson.build b/meson.build index a3315b5..85c04b2 100644 --- a/meson.build +++ b/meson.build @@ -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.' ) diff --git a/src/meson.build b/src/meson.build index dc6a837..148edd8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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 + ) diff --git a/src/vector/stb/meson.build b/src/vector/stb/meson.build index a7a59c0..79f1962 100644 --- a/src/vector/stb/meson.build +++ b/src/vector/stb/meson.build @@ -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 + ) diff --git a/src/vector/vimageloader.cpp b/src/vector/vimageloader.cpp index 28a774a..c7e73b7 100644 --- a/src/vector/vimageloader.cpp +++ b/src/vector/vimageloader.cpp @@ -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() { diff --git a/test/meson.build b/test/meson.build index 8a83c86..312e53e 100644 --- a/test/meson.build +++ b/test/meson.build @@ -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) -- 2.7.4