From f306043009707d8e893d978649671405f93246bf Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Mon, 15 Apr 2024 13:30:17 +0900 Subject: [PATCH] Split widget-viewer-dali binding from dali-csharp-binder.so Change-Id: Ie7f56972e378d913776de5627857f3da1955a7f9 Signed-off-by: huiyu.eun --- build/tizen/CMakeLists.txt | 6 +++ build/tizen/dali-scene3d/CMakeLists.txt | 7 ++++ .../dali2-csharp-binder-scene3d.pc.in | 14 +++++++ .../dali-widget-viewer-dali/CMakeLists.txt | 41 +++++++++++++++++++ ...li2-csharp-binder-widget-viewer-dali.pc.in | 14 +++++++ dali-csharp-binder/file.list | 9 +++- packaging/dali-csharp-binder.spec | 2 + 7 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 build/tizen/dali-scene3d/dali2-csharp-binder-scene3d.pc.in create mode 100755 build/tizen/dali-widget-viewer-dali/CMakeLists.txt create mode 100644 build/tizen/dali-widget-viewer-dali/dali2-csharp-binder-widget-viewer-dali.pc.in diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 96de4287..7d17f9aa 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -31,6 +31,7 @@ OPTION(ENABLE_SCENE3D "Enable scene3d" ON) OPTION(ENABLE_PHYSICS_2D "Enable 2d physics" ON) OPTION(ENABLE_PHYSICS_3D "Enable 3d physics" ON) OPTION(ENABLE_RIVE_ANIMATION "Enable rive animation" OFF) +OPTION(ENABLE_WIDGET_VIEWER_DALI "Enable widget viewer dali" OFF) OPTION(ENABLE_ECORE_WAYLAND2 "Enable ecore wayland2" OFF) # Set up compiler definitions @@ -269,6 +270,7 @@ 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 "Use widget viewer dali: " ${ENABLE_WIDGET_VIEWER_DALI} ) MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} ) MESSAGE( STATUS "LDFLAGS: " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} ) @@ -280,6 +282,10 @@ IF( ENABLE_RIVE_ANIMATION ) ADD_SUBDIRECTORY( dali-rive-animation ) ENDIF() +IF( ENABLE_WIDGET_VIEWER_DALI ) + ADD_SUBDIRECTORY( dali-widget-viewer-dali ) +ENDIF() + IF( ENABLE_PHYSICS_2D ) ADD_SUBDIRECTORY( dali-physics-2d ) ENDIF() diff --git a/build/tizen/dali-scene3d/CMakeLists.txt b/build/tizen/dali-scene3d/CMakeLists.txt index c1e07797..0a18bc22 100755 --- a/build/tizen/dali-scene3d/CMakeLists.txt +++ b/build/tizen/dali-scene3d/CMakeLists.txt @@ -4,11 +4,18 @@ SET( SCENE3D_SOURCES ${dali_csharp_binder_scene3d_src_files}) ADD_LIBRARY( ${SCENE3D_TARGET} SHARED ${SCENE3D_SOURCES} ) +IF (ENABLE_PKG_CONFIGURE) + FIND_PACKAGE(PkgConfig REQUIRED) + SET(CORE_PKG_CFG_FILE dali2-csharp-binder-scene3d.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FIE} @ONLY) +ENDIF() + TARGET_LINK_LIBRARIES( ${SCENE3D_TARGET} PUBLIC ${DLOG_LDFLAGS} ${DALICORE_LDFLAGS} ${DALIADAPTOR_LDFLAGS} ${DALITOOLKIT_LDFLAGS} + dali2-csharp-binder ${DALISCENE3D_LDFLAGS}) TARGET_COMPILE_OPTIONS( ${SCENE3D_TARGET} PUBLIC diff --git a/build/tizen/dali-scene3d/dali2-csharp-binder-scene3d.pc.in b/build/tizen/dali-scene3d/dali2-csharp-binder-scene3d.pc.in new file mode 100644 index 00000000..65166588 --- /dev/null +++ b/build/tizen/dali-scene3d/dali2-csharp-binder-scene3d.pc.in @@ -0,0 +1,14 @@ +# Package Information for pkg-config + +prefix=@PREFIX@ +exec_prefix=@EXEC_PREFIX@ +apiversion=@DALI_CSHARP_BINDER_VERSION@ +libdir=@LIB_DIR@ +includedir=@DEV_INCLUDE_PATH@ + +Name: DALi C# binder +Description: DALi C# binder Library for scene3D +Version: ${apiversion} +Requires: dali2-csharp-binder +Libs: -L${libdir} -ldali2-csharp-binder-scene3d +Cflags: -I${includedir}/dali-csharp-binder diff --git a/build/tizen/dali-widget-viewer-dali/CMakeLists.txt b/build/tizen/dali-widget-viewer-dali/CMakeLists.txt new file mode 100755 index 00000000..b895ac20 --- /dev/null +++ b/build/tizen/dali-widget-viewer-dali/CMakeLists.txt @@ -0,0 +1,41 @@ +SET(WIDGET_VIEWER_DALI_TARGET dali2-csharp-binder-widget-viewer-dali) + +SET( WIDGET_VIEWER_DALI_SOURCES ${dali_csharp_binder_widget_viewer_dali_src_files}) + +ADD_LIBRARY( ${WIDGET_VIEWER_DALI_TARGET} SHARED ${WIDGET_VIEWER_DALI_SOURCES} ) + +OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON) + +IF (ENABLE_PKG_CONFIGURE) + FIND_PACKAGE(PkgConfig REQUIRED) + PKG_CHECK_MODULES(EXTWIDGETVIEWER widget_viewer_dali) + PKG_CHECK_MODULES(DALICSHARP_BINDER dali2-csharp-binder) + + SET(CORE_PKG_CFG_FILE dali2-csharp-binder-widget-viewer-dali.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FIE} @ONLY) +ENDIF() + + +TARGET_LINK_LIBRARIES( ${WIDGET_VIEWER_DALI_TARGET} PUBLIC + ${DLOG_LDFLAGS} + ${DALICORE_LDFLAGS} + ${DALIADAPTOR_LDFLAGS} + ${DALITOOLKIT_LDFLAGS} + ${DALICSHARP_BINDER} + ${EXTWIDGETVIEWER_LDFLAGS} +) + +TARGET_COMPILE_OPTIONS( ${WIDGET_VIEWER_DALI_TARGET} PUBLIC + ${DLOG_CFLAGS} + ${DALICORE_CFLAGS} + ${DALIADAPTOR_CFLAGS} + ${DALITOOLKIT_CFLAGS} + ${DALI_PROFILE_CFLAGS} + ${DALICSHARP_BINDER} + ${EXTWIDGETVIEWER_CFLAGS} + ${} + -I../../../ + -Wall +) + +INSTALL( TARGETS ${WIDGET_VIEWER_DALI_TARGET} DESTINATION ${LIB_DIR} ) diff --git a/build/tizen/dali-widget-viewer-dali/dali2-csharp-binder-widget-viewer-dali.pc.in b/build/tizen/dali-widget-viewer-dali/dali2-csharp-binder-widget-viewer-dali.pc.in new file mode 100644 index 00000000..5fcd7214 --- /dev/null +++ b/build/tizen/dali-widget-viewer-dali/dali2-csharp-binder-widget-viewer-dali.pc.in @@ -0,0 +1,14 @@ +# Package Information for pkg-config + +prefix=@PREFIX@ +exec_prefix=@EXEC_PREFIX@ +apiversion=@DALI_CSHARP_BINDER_VERSION@ +libdir=@LIB_DIR@ +includedir=@DEV_INCLUDE_PATH@ + +Name: DALi C# binder +Description: DALi C# binder Library for widget-viewer +Version: ${apiversion} +Requires: dali2-csharp-binder +Libs: -L${libdir} -ldali2-csharp-binder-widget-viewer-dali +Cflags: -I${includedir}/dali-csharp-binder diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list index a65b23af..7a9e931c 100755 --- a/dali-csharp-binder/file.list +++ b/dali-csharp-binder/file.list @@ -88,8 +88,6 @@ SET( dali_csharp_binder_tizen_src_files ${dali_csharp_binder_dir}/dali-adaptor/keyboard-wrap.cpp ${dali_csharp_binder_dir}/dali-adaptor/key-grab-wrap.cpp ${dali_csharp_binder_dir}/dali-toolkit/transition-effects-wrap.cpp - ${dali_csharp_binder_dir}/widget-viewer-dali/widget-view-wrap.cpp - ${dali_csharp_binder_dir}/widget-viewer-dali/widget-view-manager-wrap.cpp ${dali_csharp_binder_dir}/common/tizen-dependency-wrap.cpp ) @@ -99,6 +97,13 @@ SET( dali_csharp_binder_rive_animation_src_files ${dali_csharp_binder_dir}/dali-extension/rive-animation-view-wrap.cpp ) +# added for widget-viewer-dali for tizen +# module: csharp-binder(widget-viewer-dali.so), backend: mobile,tv,ivi,watch +SET( dali_csharp_binder_widget_viewer_dali_src_files + ${dali_csharp_binder_dir}/widget-viewer-dali/widget-view-wrap.cpp + ${dali_csharp_binder_dir}/widget-viewer-dali/widget-view-manager-wrap.cpp +) + # module: csharp-binder, backend: tizen-wearable SET( dali_csharp_binder_tizen_wearable_src_files ${dali_csharp_binder_dir}/dali-adaptor/watch-wrap.cpp diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec index c014bf2c..f97fd1ee 100644 --- a/packaging/dali-csharp-binder.spec +++ b/packaging/dali-csharp-binder.spec @@ -256,6 +256,7 @@ cmake_flags+=" -DENABLE_TIZEN_MAJOR_VERSION=%{tizen_version_major}" cmake_flags+=" -DENABLE_SCENE3D=ON" cmake_flags+=" -DENABLE_PHYSICS_2D=ON" cmake_flags+=" -DENABLE_PHYSICS_3D=ON" +cmake_flags+=" -DENABLE_WIDGET_VIEWER_DALI=ON" # Set up the build via Cmake @@ -543,6 +544,7 @@ exit 0 %{_libdir}/libdali2-csharp-binder.so.2 %{_libdir}/libdali2-csharp-binder.so.2.0.0 %{_libdir}/libdali2-csharp-binder-rive-animation.so* +%{_libdir}/libdali2-csharp-binder-widget-viewer-dali.so* ################################################# -- 2.34.1