From 67d3e1531f131919d729085a6ed8db65f5929482 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 10 Sep 2014 18:01:51 +0100 Subject: [PATCH] (Build) Combined common & application libraries Change-Id: I974fe5a668001364489c4891ec01774f72e04bf9 --- adaptors/common/adaptor-impl.h | 12 +- adaptors/common/callback-manager.h | 8 +- adaptors/common/file.list | 8 +- adaptors/common/render-surface-impl.h | 2 +- adaptors/common/singleton-service-impl.h | 2 +- adaptors/common/trigger-event.h | 2 +- adaptors/mobile/file.list | 5 - adaptors/mobile/mobile-render-surface-factory.h | 2 +- adaptors/public-api/dali.h | 7 +- adaptors/public-api/file.list | 8 +- adaptors/tizen/file.list | 4 +- adaptors/ubuntu/file.list | 5 +- adaptors/wayland/ecore-wl-render-surface-factory.h | 2 +- adaptors/wayland/ecore-wl-render-surface.h | 2 +- adaptors/wayland/file.list | 5 +- adaptors/x11/ecore-x-render-surface-factory.h | 2 +- adaptors/x11/ecore-x-render-surface.h | 2 +- adaptors/x11/file.list | 8 +- build/tizen/Makefile.am | 11 +- build/tizen/{common => adaptor}/Makefile.am | 83 +++++++---- .../{dali-application => adaptor}/linker-test.cpp | 0 build/tizen/configure.ac | 4 +- build/tizen/dali-application.pc.in | 12 -- build/tizen/dali-application/Makefile.am | 157 --------------------- build/tizen/dali.pc.in | 4 +- packaging/dali-adaptor-mobile.spec | 1 - packaging/dali-adaptor-wearable.spec | 1 - packaging/dali-adaptor.spec | 1 - 28 files changed, 94 insertions(+), 266 deletions(-) rename build/tizen/{common => adaptor}/Makefile.am (84%) rename build/tizen/{dali-application => adaptor}/linker-test.cpp (100%) delete mode 100644 build/tizen/dali-application.pc.in delete mode 100644 build/tizen/dali-application/Makefile.am diff --git a/adaptors/common/adaptor-impl.h b/adaptors/common/adaptor-impl.h index 12f9496..c03d0a8 100644 --- a/adaptors/common/adaptor-impl.h +++ b/adaptors/common/adaptor-impl.h @@ -97,7 +97,7 @@ public: * - Window, adaptor will use existing Window to draw on to * @param[in] baseLayout The base layout that the application has been written for */ - DALI_IMPORT_API static Dali::Adaptor* New( RenderSurface* surface, const DeviceLayout& baseLayout ); + static Dali::Adaptor* New( RenderSurface* surface, const DeviceLayout& baseLayout ); /** * 2-step initialisation, this should be called after creating an adaptor instance. @@ -220,7 +220,7 @@ public: * @param[in] hDpi The Horizontal DPI * @param[in] vDpi The Vertical DPI */ - DALI_IMPORT_API void SetDpi(size_t hDpi, size_t vDpi); + void SetDpi(size_t hDpi, size_t vDpi); /** * @return reference to EglFactory class @@ -349,22 +349,22 @@ public: // Stereoscopy /** * @copydoc Dali::Integration::Core::SetViewMode() */ - DALI_IMPORT_API void SetViewMode( ViewMode viewMode ); + void SetViewMode( ViewMode viewMode ); /** * @copydoc Dali::Integration::Core::GetViewMode() */ - DALI_IMPORT_API ViewMode GetViewMode() const; + ViewMode GetViewMode() const; /** * @copydoc Dali::Integration::Core::SetStereoBase() */ - DALI_IMPORT_API void SetStereoBase( float stereoBase ); + void SetStereoBase( float stereoBase ); /** * @copydoc Dali::Integration::Core::GetStereoBase() */ - DALI_IMPORT_API float GetStereoBase() const; + float GetStereoBase() const; public: // Signals diff --git a/adaptors/common/callback-manager.h b/adaptors/common/callback-manager.h index 6bf3eb3..b666366 100644 --- a/adaptors/common/callback-manager.h +++ b/adaptors/common/callback-manager.h @@ -1,5 +1,5 @@ -#ifndef __DALI_CALLBACK_MANAGER_H__ -#define __DALI_CALLBACK_MANAGER_H__ +#ifndef __DALI_INTERNAL_CALLBACK_MANAGER_H__ +#define __DALI_INTERNAL_CALLBACK_MANAGER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -34,7 +34,7 @@ namespace Adaptor /** * Abstract interface to install call backs in to an applications main loop. */ -class DALI_IMPORT_API CallbackManager +class CallbackManager { public: @@ -123,4 +123,4 @@ private: } // namespace Dali -#endif // __DALI_CALLBACK_MANAGER_H__ +#endif // __DALI_INTERNAL_CALLBACK_MANAGER_H__ diff --git a/adaptors/common/file.list b/adaptors/common/file.list index 96f7ed6..91784e7 100644 --- a/adaptors/common/file.list +++ b/adaptors/common/file.list @@ -1,10 +1,13 @@ # Common adaptor_common_internal_src_files = \ + $(adaptor_common_dir)/abort-handler.cpp \ $(adaptor_common_dir)/accessibility-gesture-detector.cpp \ $(adaptor_common_dir)/adaptor-impl.cpp \ + $(adaptor_common_dir)/application-impl.cpp \ $(adaptor_common_dir)/bitmap-loader-impl.cpp \ $(adaptor_common_dir)/clipboard-event-notifier-impl.cpp \ + $(adaptor_common_dir)/command-line-options.cpp \ $(adaptor_common_dir)/drag-and-drop-detector-impl.cpp \ $(adaptor_common_dir)/ecore-callback-manager.cpp \ $(adaptor_common_dir)/file-descriptor-monitor.cpp \ @@ -47,8 +50,3 @@ adaptor_common_internal_src_files = \ adaptor_common_internal_default_profile_src_files = \ $(adaptor_common_dir)/color-controller-impl.cpp \ $(adaptor_common_dir)/system-settings.cpp - -adaptor_common_application_internal_src_files = \ - $(adaptor_common_dir)/application-impl.cpp \ - $(adaptor_common_dir)/command-line-options.cpp \ - $(adaptor_common_dir)/abort-handler.cpp diff --git a/adaptors/common/render-surface-impl.h b/adaptors/common/render-surface-impl.h index b3d94a8..921e56d 100644 --- a/adaptors/common/render-surface-impl.h +++ b/adaptors/common/render-surface-impl.h @@ -45,7 +45,7 @@ class EglInterface; /** * This is the internal RenderSurface API */ -class DALI_IMPORT_API RenderSurface : public Dali::RenderSurface +class RenderSurface : public Dali::RenderSurface { public: diff --git a/adaptors/common/singleton-service-impl.h b/adaptors/common/singleton-service-impl.h index b86fc0e..7f2819e 100644 --- a/adaptors/common/singleton-service-impl.h +++ b/adaptors/common/singleton-service-impl.h @@ -43,7 +43,7 @@ public: * This should only be called once by the Application class. * @return A newly created SingletonService. */ - static Dali::SingletonService New() DALI_IMPORT_API; + static Dali::SingletonService New(); /** * @copydoc Dali::SingletonService::Get() diff --git a/adaptors/common/trigger-event.h b/adaptors/common/trigger-event.h index f5bb6d3..64a2392 100644 --- a/adaptors/common/trigger-event.h +++ b/adaptors/common/trigger-event.h @@ -46,7 +46,7 @@ class FileDescriptorMonitor; * * The implementation of TriggerEvent uses an event file descriptor. */ -class DALI_IMPORT_API TriggerEvent : public TriggerEventInterface +class TriggerEvent : public TriggerEventInterface { public: diff --git a/adaptors/mobile/file.list b/adaptors/mobile/file.list index 1d6505f..c88b1db 100644 --- a/adaptors/mobile/file.list +++ b/adaptors/mobile/file.list @@ -3,8 +3,3 @@ adaptor_common_internal_mobile_profile_src_files = \ $(adaptor_mobile_dir)/mobile-render-surface-factory.cpp \ $(adaptor_mobile_dir)/mobile-system-settings.cpp \ $(adaptor_mobile_dir)/mobile-color-controller-impl.cpp - -adaptor_common_application_mobile_profile_src_files = \ - $(adaptor_mobile_dir)/mobile-render-surface-factory.cpp \ - $(adaptor_mobile_dir)/mobile-system-settings.cpp \ - $(adaptor_mobile_dir)/mobile-color-controller-impl.cpp diff --git a/adaptors/mobile/mobile-render-surface-factory.h b/adaptors/mobile/mobile-render-surface-factory.h index 187099c..a022cbc 100644 --- a/adaptors/mobile/mobile-render-surface-factory.h +++ b/adaptors/mobile/mobile-render-surface-factory.h @@ -52,7 +52,7 @@ class RenderSurface; * @param [in] name Name of surface passed in * @param [in] isTransparent Whether the surface has an alpha channel */ -DALI_IMPORT_API RenderSurface* CreatePixmapSurface( +RenderSurface* CreatePixmapSurface( PositionSize positionSize, Any surface, Any display, diff --git a/adaptors/public-api/dali.h b/adaptors/public-api/dali.h index a82c4ab..c8e7abf 100644 --- a/adaptors/public-api/dali.h +++ b/adaptors/public-api/dali.h @@ -22,16 +22,11 @@ // Application / UI Framework adaption -// These defines come from running pkg-config --cflags with the correct package config file - -#if defined(DALI_APPLICATION) -#include -#endif - #include #include #include #include +#include #include #include #include diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list index 0a0dd23..75168f2 100644 --- a/adaptors/public-api/file.list +++ b/adaptors/public-api/file.list @@ -1,6 +1,7 @@ public_api_src_files = \ $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.cpp \ $(adaptor_public_api_dir)/adaptor-framework/adaptor.cpp \ + $(adaptor_public_api_dir)/adaptor-framework/application.cpp \ $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.cpp \ $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.cpp \ $(adaptor_public_api_dir)/adaptor-framework/color-controller.cpp \ @@ -26,9 +27,6 @@ public_api_src_files = \ $(adaptor_public_api_dir)/adaptor-framework/window.cpp \ $(adaptor_public_api_dir)/dali-adaptor-version.cpp -public_api_application_src_files = \ - $(adaptor_public_api_dir)/adaptor-framework/application.cpp - public_api_header_files = \ $(adaptor_public_api_dir)/dali-adaptor-version.h @@ -37,6 +35,7 @@ public_api_adaptor_framework_header_files = \ $(adaptor_public_api_dir)/adaptor-framework/accessibility-gesture-handler.h \ $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.h \ $(adaptor_public_api_dir)/adaptor-framework/adaptor.h \ + $(adaptor_public_api_dir)/adaptor-framework/application.h \ $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.h \ $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.h \ $(adaptor_public_api_dir)/adaptor-framework/clipboard-event-notifier.h \ @@ -63,8 +62,5 @@ public_api_adaptor_framework_header_files = \ $(adaptor_public_api_dir)/adaptor-framework/virtual-keyboard.h \ $(adaptor_public_api_dir)/adaptor-framework/window.h -public_api_application_header_files = \ - $(adaptor_public_api_dir)/adaptor-framework/application.h - adaptor_dali_header_file = \ $(adaptor_public_api_dir)/dali.h diff --git a/adaptors/tizen/file.list b/adaptors/tizen/file.list index 8a1dc9c..3e0609f 100644 --- a/adaptors/tizen/file.list +++ b/adaptors/tizen/file.list @@ -2,10 +2,8 @@ adaptor_tizen_internal_src_files = \ $(adaptor_tizen_dir)/accessibility-manager-impl-tizen.cpp \ + $(adaptor_tizen_dir)/framework-tizen.cpp \ $(adaptor_tizen_dir)/vsync-monitor-tizen.cpp \ $(adaptor_tizen_dir)/tilt-sensor-impl-tizen.cpp \ $(adaptor_tizen_dir)/tts-player-impl-tizen.cpp -adaptor_tizen_application_src_files = \ - $(adaptor_tizen_dir)/framework-tizen.cpp - diff --git a/adaptors/ubuntu/file.list b/adaptors/ubuntu/file.list index 6f6eb02..d8c6357 100644 --- a/adaptors/ubuntu/file.list +++ b/adaptors/ubuntu/file.list @@ -2,11 +2,8 @@ adaptor_ubuntu_internal_src_files = \ $(adaptor_ubuntu_dir)/accessibility-manager-impl-ubuntu.cpp \ + $(adaptor_ubuntu_dir)/framework-ubuntu.cpp \ $(adaptor_ubuntu_dir)/vsync-monitor-ubuntu.cpp \ $(adaptor_ubuntu_dir)/tilt-sensor-impl-ubuntu.cpp \ $(adaptor_ubuntu_dir)/tts-player-impl-ubuntu.cpp \ $(adaptor_ubuntu_dir)/key-impl-ubuntu.cpp - -adaptor_ubuntu_application_src_files = \ - $(adaptor_ubuntu_dir)/framework-ubuntu.cpp - diff --git a/adaptors/wayland/ecore-wl-render-surface-factory.h b/adaptors/wayland/ecore-wl-render-surface-factory.h index 5406dcd..fe3dca3 100644 --- a/adaptors/wayland/ecore-wl-render-surface-factory.h +++ b/adaptors/wayland/ecore-wl-render-surface-factory.h @@ -52,7 +52,7 @@ class RenderSurface; * @param [in] name Name of surface passed in * @param [in] isTransparent Whether the surface has an alpha channel */ -DALI_IMPORT_API RenderSurface* CreatePixmapSurface( +RenderSurface* CreatePixmapSurface( PositionSize positionSize, Any surface, Any display, diff --git a/adaptors/wayland/ecore-wl-render-surface.h b/adaptors/wayland/ecore-wl-render-surface.h index a2aac02..04909da 100644 --- a/adaptors/wayland/ecore-wl-render-surface.h +++ b/adaptors/wayland/ecore-wl-render-surface.h @@ -48,7 +48,7 @@ namespace ECore * @todo change namespace to ECore_Wayland as the class * is no longer pure Wayland. */ -class DALI_IMPORT_API RenderSurface : public Internal::Adaptor::RenderSurface +class RenderSurface : public Internal::Adaptor::RenderSurface { public: /** diff --git a/adaptors/wayland/file.list b/adaptors/wayland/file.list index 2720a91..9694a1e 100644 --- a/adaptors/wayland/file.list +++ b/adaptors/wayland/file.list @@ -3,6 +3,7 @@ adaptor_wayland_tizen_internal_src_files = \ $(adaptor_wayland_dir)/accessibility-manager-impl-wl.cpp \ $(adaptor_wayland_dir)/clipboard-impl-wl.cpp \ + $(adaptor_wayland_dir)/framework-wl.cpp \ $(adaptor_wayland_dir)/imf-manager-impl-wl.cpp \ $(adaptor_wayland_dir)/pixmap-image-impl-wl.cpp \ $(adaptor_wayland_dir)/server-connection-wl.cpp \ @@ -18,7 +19,3 @@ adaptor_wayland_tizen_internal_src_files = \ adaptor_wayland_tizen_common_internal_default_profile_src_files = \ $(adaptor_wayland_dir)/ecore-wl-render-surface-factory.cpp \ $(adaptor_wayland_dir)/system-settings-wl.cpp - -adaptor_wayland_tizen_application_src_files = \ - $(adaptor_wayland_dir)/framework-wl.cpp - diff --git a/adaptors/x11/ecore-x-render-surface-factory.h b/adaptors/x11/ecore-x-render-surface-factory.h index 7bf9ed3..b29bf79 100644 --- a/adaptors/x11/ecore-x-render-surface-factory.h +++ b/adaptors/x11/ecore-x-render-surface-factory.h @@ -52,7 +52,7 @@ class RenderSurface; * @param [in] name Name of surface passed in * @param [in] isTransparent Whether the surface has an alpha channel */ -DALI_IMPORT_API RenderSurface* CreatePixmapSurface( +RenderSurface* CreatePixmapSurface( PositionSize positionSize, Any surface, Any display, diff --git a/adaptors/x11/ecore-x-render-surface.h b/adaptors/x11/ecore-x-render-surface.h index d1434af..7af5a27 100644 --- a/adaptors/x11/ecore-x-render-surface.h +++ b/adaptors/x11/ecore-x-render-surface.h @@ -47,7 +47,7 @@ namespace ECore * @todo change namespace to ECore_X11 as the class * is no longer pure X11. */ -class DALI_IMPORT_API RenderSurface : public Internal::Adaptor::RenderSurface +class RenderSurface : public Internal::Adaptor::RenderSurface { public: /** diff --git a/adaptors/x11/file.list b/adaptors/x11/file.list index 3b9e604..5356395 100644 --- a/adaptors/x11/file.list +++ b/adaptors/x11/file.list @@ -21,16 +21,14 @@ adaptor_x11_ubuntu_internal_src_files = \ adaptor_x11_tizen_internal_src_files = \ $(_adaptor_x11_internal_src_files) \ $(adaptor_x11_dir)/accessibility-manager-impl-x.cpp \ + $(adaptor_x11_dir)/framework-x.cpp \ $(adaptor_x11_dir)/key-impl-x.cpp adaptor_x11_tv_internal_src_files = \ $(_adaptor_x11_internal_src_files) \ - $(adaptor_x11_dir)/accessibility-manager-impl-x.cpp + $(adaptor_x11_dir)/accessibility-manager-impl-x.cpp \ + $(adaptor_x11_dir)/framework-x.cpp adaptor_x11_internal_default_profile_src_files = \ $(adaptor_x11_dir)/ecore-x-render-surface-factory.cpp \ $(adaptor_x11_dir)/system-settings-x.cpp - -adaptor_x11_tizen_application_src_files = \ - $(adaptor_x11_dir)/framework-x.cpp - diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am index 2529831..55b1e15 100644 --- a/build/tizen/Makefile.am +++ b/build/tizen/Makefile.am @@ -14,7 +14,7 @@ # limitations under the License. # -SUBDIRS = common dali-application +SUBDIRS = adaptor if ! LITE_PROFILE if ! WEARABLE_PROFILE @@ -25,8 +25,7 @@ endif endif pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dali.pc \ - dali-application.pc +pkgconfig_DATA = dali.pc MAINTAINERCLEANFILES = \ aclocal.m4 \ @@ -50,9 +49,9 @@ COVERAGE_OUTPUT_DIR=doc/coverage cov_data: @test -z $(COVERAGE_DIR) || mkdir -p $(COVERAGE_DIR) @rm -f $(COVERAGE_DIR)/* - @-cp common/.libs/*.gcda common/.libs/*.gcno $(COVERAGE_DIR) - @for i in `find $(COVERAGE_DIR) -name "libdali_adaptor_common_la-*.gcda" -o -name "libdali_adaptor_common_la-*.gcno"` ;\ - do mv $$i `echo $$i | sed s/libdali_adaptor_common_la-//` ; echo $$i ; done + @-cp adaptor/.libs/*.gcda adaptor/.libs/*.gcno $(COVERAGE_DIR) + @for i in `find $(COVERAGE_DIR) -name "libdali_adaptor_la-*.gcda" -o -name "libdali_adaptor_la-*.gcno"` ;\ + do mv $$i `echo $$i | sed s/libdali_adaptor_la-//` ; echo $$i ; done @cd $(COVERAGE_DIR) ; lcov --base-directory . --directory . -c -o dali.info @cd $(COVERAGE_DIR) ; lcov --remove dali.info "*boost*" "dali-env/*" "/usr/include/*" -o dali.info @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR) diff --git a/build/tizen/common/Makefile.am b/build/tizen/adaptor/Makefile.am similarity index 84% rename from build/tizen/common/Makefile.am rename to build/tizen/adaptor/Makefile.am index 2c059f2..2bd6051 100644 --- a/build/tizen/common/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -14,7 +14,7 @@ # limitations under the License. # -# Build the Dali Adaptor common intermediate library +# Build the Dali Adaptor library ############# INCLUDE FILE LISTS ############# @@ -160,18 +160,18 @@ else slp_platform_abstraction_src_files += $(slp_jpeg_loader) endif -lib_LTLIBRARIES = libdali-adaptor-common.la +lib_LTLIBRARIES = libdali-adaptor.la -libdali_adaptor_common_la_SOURCES = \ +libdali_adaptor_la_SOURCES = \ $(base_adaptor_src_files) \ $(slp_platform_abstraction_src_files) \ $(public_api_src_files) \ $(adaptor_internal_src_files) -libdali_adaptor_common_la_DEPENDENCIES = +libdali_adaptor_la_DEPENDENCIES = # List include directories with more platform-specific (slp) before portable root: -libdali_adaptor_common_la_includes = \ +libdali_adaptor_la_includes = \ -I../../.. \ -I../../../platform-abstractions/slp \ -I../../../platform-abstractions/slp/resource-loader \ @@ -182,26 +182,27 @@ libdali_adaptor_common_la_includes = \ -I../../../adaptors/common \ -I../../../adaptors/ if WAYLAND -libdali_adaptor_common_la_includes += \ +libdali_adaptor_la_includes += \ -I../../../adaptors/wayland else -libdali_adaptor_common_la_includes += \ +libdali_adaptor_la_includes += \ -I../../../adaptors/x11 endif if UBUNTU_PROFILE -libdali_adaptor_common_la_includes += \ +libdali_adaptor_la_includes += \ -I../../../adaptors/ubuntu else -libdali_adaptor_common_la_includes += \ +libdali_adaptor_la_includes += \ -I../../../adaptors/tizen endif daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/ daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/ daliDefaultThemeDir = ${dataReadWriteDir}/theme/ +daliUserShaderCacheDir = ${dataReadWriteDir}/core/shaderbin/ -libdali_adaptor_common_la_CXXFLAGS = \ +libdali_adaptor_la_CXXFLAGS = \ -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \ -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \ -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \ @@ -215,7 +216,7 @@ libdali_adaptor_common_la_CXXFLAGS = \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ -Werror -Wall -lgcc \ - $(libdali_adaptor_common_la_includes) \ + $(libdali_adaptor_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ $(DALICORE_CFLAGS) \ $(OPENGLES20_CFLAGS) \ @@ -238,7 +239,7 @@ libdali_adaptor_common_la_CXXFLAGS = \ $(LIBEXIF_CFLAGS) \ $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) -libdali_adaptor_common_la_LIBADD = \ +libdali_adaptor_la_LIBADD = \ $(DALICORE_LIBS) \ $(OPENGLES20_LIBS) \ $(FREETYPE_LIBS) \ @@ -255,59 +256,60 @@ libdali_adaptor_common_la_LIBADD = \ $(LIBDRM_LIBS) \ $(LIBEXIF_LIBS) \ $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ + $(CAPI_APPFW_APPLICATION_LIBS) \ -lgif \ -lboost_thread if WAYLAND -libdali_adaptor_common_la_CXXFLAGS += $(WAYLAND_CFLAGS) -libdali_adaptor_common_la_LIBADD += $(WAYLAND_LIBS) +libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS) +libdali_adaptor_la_LIBADD += $(WAYLAND_LIBS) else -libdali_adaptor_common_la_CXXFLAGS += $(X11_CFLAGS) -libdali_adaptor_common_la_LIBADD += $(X11_LIBS) -libdali_adaptor_common_la_LIBADD += $(ECORE_X_LIBS) +libdali_adaptor_la_CXXFLAGS += $(X11_CFLAGS) +libdali_adaptor_la_LIBADD += $(X11_LIBS) +libdali_adaptor_la_LIBADD += $(ECORE_X_LIBS) endif if COMMON_PROFILE -libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS) +libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) endif if MOBILE_PROFILE -libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \ +libdali_adaptor_la_CXXFLAGS += $(ASSIMP_CFLAGS) \ $(DEVICED_CFLAGS) \ $(EFL_ASSIST_CFLAGS) \ $(NATIVE_BUFFER_CFLAGS) \ $(NATIVE_BUFFER_POOL_CFLAGS) -libdali_adaptor_common_la_LIBADD += $(ASSIMP_LIBS) \ +libdali_adaptor_la_LIBADD += $(ASSIMP_LIBS) \ $(EFL_ASSIST_LIBS) \ $(NATIVE_BUFFER_LIBS) \ $(NATIVE_BUFFER_POOL_LIBS) endif if LITE_PROFILE -libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS) +libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) endif if WEARABLE_PROFILE -libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS) +libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) endif if TV_PROFILE -libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \ +libdali_adaptor_la_CXXFLAGS += $(ASSIMP_CFLAGS) \ $(HAPTIC_CFLAGS) -libdali_adaptor_common_la_LIBADD += $(ASSIMP_LIBS) +libdali_adaptor_la_LIBADD += $(ASSIMP_LIBS) endif if TURBO_JPEG_IS_ON -libdali_adaptor_common_la_LIBADD += -lturbojpeg +libdali_adaptor_la_LIBADD += -lturbojpeg CFLAGS += -D_TURBO_JPEG_LOADER if UBUNTU_PROFILE -libdali_adaptor_common_la_LIBADD += -ljpeg +libdali_adaptor_la_LIBADD += -ljpeg CFLAGS += -fPIC endif else -libdali_adaptor_common_la_LIBADD += -ljpeg +libdali_adaptor_la_LIBADD += -ljpeg endif tizenadaptorpublicapidir = $(devincludepath)/dali/public-api @@ -318,3 +320,30 @@ tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_f tizenadaptordaliheaderdir = $(devincludepath)/dali tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file) + +install-data-local: + $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliUserShaderCacheDir} + +# Install resource log analyzer script +bin_SCRIPTS = ../../../adaptors/scripts/dalireslog.sh + +# linking test + +noinst_PROGRAMS = linker.test + +linker_test_SOURCES = linker-test.cpp + +linker_test_CXXFLAGS = \ + -I../../../adaptors/common \ + -I../../../adaptors/public-api \ + -I../../../adaptors/public-api/adaptor-framework \ + $(DALI_ADAPTOR_CFLAGS) \ + $(DALICORE_CFLAGS) \ + $(DALIX11_CFLAGS) \ + -Werror -Wall + +linker_test_DEPENDENCIES = libdali-adaptor.la +linker_test_LDADD = \ + $(DALICORE_LIBS) \ + libdali-adaptor.la \ + -L${prefix}/lib diff --git a/build/tizen/dali-application/linker-test.cpp b/build/tizen/adaptor/linker-test.cpp similarity index 100% rename from build/tizen/dali-application/linker-test.cpp rename to build/tizen/adaptor/linker-test.cpp diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 11627da..413aff6 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -232,10 +232,8 @@ AC_SUBST(devincludepath) AC_CONFIG_FILES([ Makefile - common/Makefile + adaptor/Makefile dali.pc - dali-application/Makefile - dali-application.pc ]) if test "x$enable_profile" != "xLITE"; then diff --git a/build/tizen/dali-application.pc.in b/build/tizen/dali-application.pc.in deleted file mode 100644 index 85428b6..0000000 --- a/build/tizen/dali-application.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -apiversion=@DALI_ADAPTOR_VERSION@ -libdir=@libdir@ -includedir=@devincludepath@ - -Name: Samsung OpenGLES Toolkit Adaptor -Description: 3D Canvas Toolkit using OpenGLES (with the adaptor) -Version: ${apiversion} -Requires: dali-core -Libs: -L${libdir} -ldali-application -ldali-adaptor-common -Cflags: -I${includedir}/dali -DDALI_APPLICATION diff --git a/build/tizen/dali-application/Makefile.am b/build/tizen/dali-application/Makefile.am deleted file mode 100644 index 09451d6..0000000 --- a/build/tizen/dali-application/Makefile.am +++ /dev/null @@ -1,157 +0,0 @@ -# -# Copyright (c) 2014 Samsung Electronics Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Build the Dali Adaptor + Application library - -# Common -adaptor_common_dir = ../../../adaptors/common -include ../../../adaptors/common/file.list - -# Public API -adaptor_public_api_dir = ../../../adaptors/public-api -include ../../../adaptors/public-api/file.list - -if WAYLAND -adaptor_wayland_dir = ../../../adaptors/wayland -include ../../../adaptors/wayland/file.list -else -adaptor_x11_dir = ../../../adaptors/x11 -include ../../../adaptors/x11/file.list -endif - -if UBUNTU_PROFILE -adaptor_ubuntu_dir = ../../../adaptors/ubuntu -include ../../../adaptors/ubuntu/file.list -else -adaptor_tizen_dir = ../../../adaptors/tizen -include ../../../adaptors/tizen/file.list -endif - -lib_LTLIBRARIES = libdali-application.la - -libdali_application_la_SOURCES = $(public_api_application_src_files) - -libdali_application_la_SOURCES += $(adaptor_common_application_internal_src_files) - -if UBUNTU_PROFILE -libdali_application_la_SOURCES += $(adaptor_ubuntu_application_src_files) -else -libdali_application_la_SOURCES += $(adaptor_tizen_application_src_files) - -if WAYLAND -libdali_application_la_SOURCES += $(adaptor_wayland_tizen_application_src_files) -else -libdali_application_la_SOURCES += $(adaptor_x11_tizen_application_src_files) -endif # WAYLAND - -endif # UBUNTU_PROFILE - -libdali_application_la_DEPENDENCIES = - -libdali_application_includes = \ - -I../../.. \ - -I../../../platform-abstractions/ \ - -I../../../platform-abstractions/slp \ - -I../../../platform-abstractions/slp/resource-loader \ - -I../../../platform-abstractions/portable \ - -I../../../adaptors/public-api \ - -I../../../adaptors/public-api/adaptor-framework \ - -I../../../adaptors/common \ - -I../../../adaptors/ - -if UBUNTU_PROFILE -libdali_application_includes += \ - -I../../../adaptors/ubuntu -endif - -if WAYLAND -libdali_application_includes += \ - -I../../../adaptors/wayland -else -libdali_application_includes += \ - -I../../../adaptors/x11 -endif - -daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/ -daliDefaultThemeDir = ${dataReadWriteDir}/theme/ -daliUserShaderCacheDir = ${dataReadWriteDir}/core/shaderbin/ - -libdali_application_la_CXXFLAGS = \ - -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \ - -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \ - -DDALI_USER_FONT_CACHE_DIR="\"${daliUserFontCacheDir}\"" \ - -DDALI_DEFAULT_THEME_DIR="\"${daliDefaultThemeDir}\"" \ - -DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \ - -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \ - -DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \ - -DNON_POWER_OF_TWO_TEXTURES \ - -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ - -Werror -Wall \ - $(libdali_application_includes) \ - $(DALI_ADAPTOR_CFLAGS) \ - $(DALICORE_CFLAGS) \ - $(OPENGLES20_CFLAGS) \ - $(X11_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ - $(PNG_CFLAGS) \ - $(ASSIMP_CFLAGS) \ - $(CAPI_APPFW_APPLICATION_CFLAGS) \ - $(ELEMENTARY_CFLAGS) \ - $(ECORE_IPC_CFLAGS) \ - $(DLOG_CFLAGS) \ - $(XML_CFLAGS) \ - $(VCONF_CFLAGS) \ - $(EXIF_CFLAGS) \ - $(TTS_CFLAGS) - -libdali_application_la_LIBADD = \ - $(CAPI_APPFW_APPLICATION_LIBS) \ - $(ELEMENTARY_LIBS) - -install-data-local: - $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliUserShaderCacheDir} - -# Install resource log analyzer script -bin_SCRIPTS = ../../../adaptors/scripts/dalireslog.sh - -# Install headers - -tizenadaptorpublicapidir = $(devincludepath)/dali/public-api/adaptor-framework -tizenadaptorpublicapi_HEADERS = $(public_api_application_header_files) - - -# linking test - -noinst_PROGRAMS = linker.test - -linker_test_SOURCES = linker-test.cpp - -linker_test_CXXFLAGS = \ - -I../../../adaptors/common \ - -I../../../adaptors/public-api \ - -I../../../adaptors/public-api/adaptor-framework \ - $(DALI_ADAPTOR_CFLAGS) \ - $(DALICORE_CFLAGS) \ - $(DALIX11_CFLAGS) \ - -Werror -Wall - -linker_test_DEPENDENCIES = libdali-application.la -linker_test_LDADD = \ - $(DALICORE_LIBS) \ - libdali-application.la \ - ../common/libdali-adaptor-common.la \ - -L${prefix}/lib diff --git a/build/tizen/dali.pc.in b/build/tizen/dali.pc.in index 85428b6..94a095e 100644 --- a/build/tizen/dali.pc.in +++ b/build/tizen/dali.pc.in @@ -8,5 +8,5 @@ Name: Samsung OpenGLES Toolkit Adaptor Description: 3D Canvas Toolkit using OpenGLES (with the adaptor) Version: ${apiversion} Requires: dali-core -Libs: -L${libdir} -ldali-application -ldali-adaptor-common -Cflags: -I${includedir}/dali -DDALI_APPLICATION +Libs: -L${libdir} -ldali-adaptor +Cflags: -I${includedir}/dali diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec index 954b7fb..c10224e 100644 --- a/packaging/dali-adaptor-mobile.spec +++ b/packaging/dali-adaptor-mobile.spec @@ -219,7 +219,6 @@ exit 0 %manifest dali-adaptor.manifest-mobile %defattr(-,root,root,-) %{_libdir}/libdali-adap*.so* -%{_libdir}/libdali-appl*.so* %defattr(-,app,app,-) %dir %{user_font_cache_dir} %dir %{user_shader_cache_dir} diff --git a/packaging/dali-adaptor-wearable.spec b/packaging/dali-adaptor-wearable.spec index 8bde418..507e1fb 100644 --- a/packaging/dali-adaptor-wearable.spec +++ b/packaging/dali-adaptor-wearable.spec @@ -192,7 +192,6 @@ exit 0 %manifest dali-adaptor.manifest-mobile %defattr(-,root,root,-) %{_libdir}/libdali-adap*.so* -%{_libdir}/libdali-appl*.so* %defattr(-,app,app,-) %dir %{user_font_cache_dir} %dir %{user_shader_cache_dir} diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 05ce7c5..8aa5ba7 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -216,7 +216,6 @@ exit 0 %manifest dali-adaptor.manifest %defattr(-,root,root,-) %{_libdir}/libdali-adap*.so* -%{_libdir}/libdali-appl*.so* %defattr(-,app,app,-) %dir %{user_font_cache_dir} %dir %{user_shader_cache_dir} -- 2.7.4