From 010954003a544b033b3e642aabb5acc2315ce479 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Mon, 15 Apr 2024 12:57:14 +0900 Subject: [PATCH] Split rive-tizen binding from dali-csharp-binder.so Change-Id: I83d56d90784cff37c8ed297a229846b893de15fb Signed-off-by: huiyu.eun --- build/tizen/CMakeLists.txt | 5 ++++ .../tizen/dali-rive-animation/CMakeLists.txt | 29 +++++++++++++++++++ dali-csharp-binder/file.list | 4 +-- packaging/dali-csharp-binder.spec | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100755 build/tizen/dali-rive-animation/CMakeLists.txt diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 79921eb3..96de4287 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -268,6 +268,7 @@ MESSAGE( STATUS "Use pkg configure: " ${ENABLE_PKG_CONFIGURE} ) MESSAGE( STATUS "Use 2d physics: " ${ENABLE_PHYSICS_2D} ) MESSAGE( STATUS "Use 3d physics: " ${ENABLE_PHYSICS_3D} ) MESSAGE( STATUS "Use scene 3d: " ${ENABLE_SCENE3D} ) +MESSAGE( STATUS "Use rive animation : " ${ENABLE_RIVE_ANIMATION} ) MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} ) MESSAGE( STATUS "LDFLAGS: " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} ) @@ -275,6 +276,10 @@ IF( ENABLE_SCENE3D ) ADD_SUBDIRECTORY( dali-scene3d ) ENDIF() +IF( ENABLE_RIVE_ANIMATION ) + ADD_SUBDIRECTORY( dali-rive-animation ) +ENDIF() + IF( ENABLE_PHYSICS_2D ) ADD_SUBDIRECTORY( dali-physics-2d ) ENDIF() diff --git a/build/tizen/dali-rive-animation/CMakeLists.txt b/build/tizen/dali-rive-animation/CMakeLists.txt new file mode 100755 index 00000000..39ecd821 --- /dev/null +++ b/build/tizen/dali-rive-animation/CMakeLists.txt @@ -0,0 +1,29 @@ +SET(RIVE_ANIMATION_TARGET dali2-csharp-binder-rive-animation) + +SET( RIVE_ANIMATION_SOURCES ${dali_csharp_binder_rive_animation_src_files}) + +ADD_LIBRARY( ${RIVE_ANIMATION_TARGET} SHARED ${RIVE_ANIMATION_SOURCES} ) + +PKG_CHECK_MODULES(DALIEXTRIVEANIMATION dali2-extension-rive-animation-view) + +TARGET_LINK_LIBRARIES( ${RIVE_ANIMATION_TARGET} PUBLIC + ${DLOG_LDFLAGS} + ${DALICORE_LDFLAGS} + ${DALIADAPTOR_LDFLAGS} + ${DALITOOLKIT_LDFLAGS} + ${DALIEXTRIVEANIMATION_LDFLAGS} +) + +TARGET_COMPILE_OPTIONS( ${RIVE_ANIMATION_TARGET} PUBLIC + ${DLOG_CFLAGS} + ${DALICORE_CFLAGS} + ${DALIADAPTOR_CFLAGS} + ${DALITOOLKIT_CFLAGS} + ${DALI_PROFILE_CFLAGS} + ${DALIEXTRIVEANIMATION_CFLAGS} + ${} + -I../../../ + -Wall +) + +INSTALL( TARGETS ${RIVE_ANIMATION_TARGET} DESTINATION ${LIB_DIR} ) diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list index a01b63c8..a65b23af 100755 --- a/dali-csharp-binder/file.list +++ b/dali-csharp-binder/file.list @@ -94,8 +94,8 @@ SET( dali_csharp_binder_tizen_src_files ) # added for rive animation view for tizen -# module: csharp-binder, backend: mobile,tv,ivi,watch -SET( dali_csharp_binder_tizen_rive_src_files +# module: csharp-binder(rive-animation.so), backend: mobile,tv,ivi,watch +SET( dali_csharp_binder_rive_animation_src_files ${dali_csharp_binder_dir}/dali-extension/rive-animation-view-wrap.cpp ) diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec index 8eb49d80..5577a659 100644 --- a/packaging/dali-csharp-binder.spec +++ b/packaging/dali-csharp-binder.spec @@ -192,7 +192,6 @@ Requires: %{name} = %{version}-%{release} %description physics3d 3D Physics for Dali - ############################## # Preparation ############################## @@ -543,6 +542,7 @@ exit 0 %{_libdir}/libdali2-csharp-binder.so %{_libdir}/libdali2-csharp-binder.so.2 %{_libdir}/libdali2-csharp-binder.so.2.0.0 +%{_libdir}/libdali2-csharp-binder-rive-animation.so* ################################################# -- 2.34.1