include ../../../adaptors/base/file.list
# Platform Abstraction
-slp_platform_abstraction_src_dir = ../../../platform-abstractions/slp
+tizen_platform_abstraction_src_dir = ../../../platform-abstractions/tizen
portable_platform_abstraction_src_dir = ../../../platform-abstractions/portable
-include ../../../platform-abstractions/slp/file.list
+include ../../../platform-abstractions/tizen/file.list
# Text Abstraction
text_src_dir = ../../../text
include ../../../text/file.list
+# Integration
+adaptor_integration_api_dir = ../../../adaptors/integration-api
+include ../../../adaptors/integration-api/file.list
+
# Internal Common
adaptor_common_dir = ../../../adaptors/common
include ../../../adaptors/common/file.list
adaptor_public_api_dir = ../../../adaptors/public-api
include ../../../adaptors/public-api/file.list
+# Devel API ( for use by Toolkit)
+adaptor_devel_api_dir = ../../../adaptors/devel-api
+include ../../../adaptors/devel-api/file.list
+
+
# Static libraries
static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
include ../../../text/dali/internal/libunibreak/file.list
############# source files #############
-if ASSIMP_ENABLED
-slp_platform_abstraction_src_files += $(slp_assimp_src_files)
-else
-slp_platform_abstraction_src_files += $(slp_assimp_stubs_src_files)
-endif # ASSIMP_ENABLED
-
# COMMON
if COMMON_PROFILE
adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
$(adaptor_common_internal_mobile_profile_src_files) \
$(adaptor_tizen_internal_src_files) \
- $(adaptor_x11_tizen_internal_src_files) \
$(static_libraries_libunibreak_src_files)
-endif
-
-
-# LITE
-if LITE_PROFILE
-
-adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
- $(adaptor_common_internal_mobile_profile_src_files) \
- $(adaptor_tizen_internal_src_files) \
- $(adaptor_x11_tizen_internal_src_files) \
- $(static_libraries_libunibreak_src_files)
-endif
+if WAYLAND
+adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+else
+adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files)
+endif # WAYLAND
+endif # MOBILE_PROFILE
# WEARABLE
if WEARABLE_PROFILE
adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
$(adaptor_common_internal_mobile_profile_src_files) \
$(adaptor_tizen_internal_src_files) \
- $(adaptor_x11_tizen_internal_src_files) \
$(static_libraries_libunibreak_src_files)
-endif
+if WAYLAND
+adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+else
+adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files)
+endif # WAYLAND
+
+endif # WEARABLE
# TV
adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
$(adaptor_common_internal_tv_profile_src_files) \
$(adaptor_tizen_internal_src_files) \
- $(adaptor_x11_tv_internal_src_files) \
$(static_libraries_libunibreak_src_files)
-endif
+if WAYLAND
+adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files)
+else
+adaptor_internal_src_files += $(adaptor_x11_tv_internal_src_files) \
+ $(adaptor_x11_internal_tv_profile_key_src_files)
+endif # WAYLAND
-# Feedback Plugin
-if USE_FEEDBACK
-plugin_themes_dir = ../../../adaptors/common/feedback
-dali_plugin_theme_files = $(plugin_themes_dir)/default-feedback-theme.json
-dalifeedbackthemedir = ${dataReadOnlyDir}/themes/feedback-themes/
-dalifeedbacktheme_DATA = ${dali_plugin_theme_files}
endif
-if TURBO_JPEG_IS_ON
- slp_platform_abstraction_src_files += $(slp_turbo_jpeg_loader)
+# Node JS support for using an external libuv main loop. If not enabled then just use e-core as normal
+# Used for things like callbacks, file-monintors, x input handling
+if LIB_UV_EVENT_LOOP
+main_loop_integration_src_files = $(adaptor_common_internal_uv_src_files)
+input_event_handler_src_files = $(adaptor_uv_x_event_handler_internal_src_files)
else
- slp_platform_abstraction_src_files += $(slp_jpeg_loader)
+main_loop_integration_src_files = $(adaptor_common_internal_ecore_src_files)
+input_event_handler_src_files = $(adaptor_ecore_x_event_handler_internal_src_files)
endif
+
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = dali-adaptor-integration.pc
+
lib_LTLIBRARIES = libdali-adaptor.la
libdali_adaptor_la_SOURCES = \
$(base_adaptor_src_files) \
- $(slp_platform_abstraction_src_files) \
+ $(main_loop_integration_src_files) \
+ $(tizen_platform_abstraction_src_files) \
$(text_abstraction_src_files) \
+ $(devel_api_src_files) \
$(public_api_src_files) \
- $(adaptor_internal_src_files)
+ $(adaptor_internal_src_files) \
+ $(input_event_handler_src_files)
+
libdali_adaptor_la_DEPENDENCIES =
-# List include directories with more platform-specific (slp) before portable root:
+# List include directories with more platform-specific (tizen) before portable root:
libdali_adaptor_la_includes = \
-I../../.. \
- -I../../../platform-abstractions/slp \
- -I../../../platform-abstractions/slp/resource-loader \
+ -I../../../platform-abstractions/tizen \
+ -I../../../platform-abstractions/tizen/resource-loader \
-I../../../platform-abstractions/portable \
-I../../../platform-abstractions/ \
- -I../../../adaptors/ \
-I../../../adaptors/public-api \
+ -I../../../adaptors/integration-api \
-I../../../adaptors/public-api/adaptor-framework \
+ -I../../../adaptors/devel-api/adaptor-framework \
-I../../../adaptors/common \
+ -I../../../adaptors/base/interfaces \
+ -I../../../adaptors/ \
-I../../../text \
-I../../../text/dali/internal/libunibreak
if WAYLAND
libdali_adaptor_la_includes += \
- -I../../../adaptors/wayland
+ -I../../../adaptors/wayland \
+ -I../../../adaptors/integration-api/wayland
else
libdali_adaptor_la_includes += \
- -I../../../adaptors/x11
+ -I../../../adaptors/x11 \
+ -I../../../adaptors/integration-api/x11
endif
if UBUNTU_PROFILE
-I../../../adaptors/tizen
endif
-daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
-daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
daliDefaultThemeDir = ${dataReadWriteDir}/theme/
-daliUserShaderCacheDir = ${dataReadWriteDir}/core/shaderbin/
+daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
libdali_adaptor_la_CXXFLAGS = \
-DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
-DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
-DDALI_USER_FONT_CACHE_DIR="\"${daliUserFontCacheDir}\"" \
+ -DDALI_SHADERBIN_DIR="\"${daliShaderbinCacheDir}\"" \
-DDALI_DEFAULT_THEME_DIR="\"${daliDefaultThemeDir}\"" \
-DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \
-DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
-DFONT_APPLICATION_PATH="\"${fontApplicationPath}\"" \
-DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \
- -DDALI_FEEDBACK_THEME_DIR="\"${dalifeedbackthemedir}\"" \
-DNON_POWER_OF_TWO_TEXTURES \
-DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
-Werror -Wall -lgcc \
$(FONTCONFIG_CFLAGS) \
$(PNG_CFLAGS) \
$(CAPI_APPFW_APPLICATION_CFLAGS) \
+ $(CAPI_SYSTEM_INFO_CFLAGS) \
$(ELEMENTARY_CFLAGS) \
$(EVAS_CFLAGS) \
$(ECORE_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(LIBEXIF_CFLAGS) \
$(LIBCURL_CFLAGS) \
- $(ASSIMP_CFLAGS) \
- $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS)
+ $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
+ $(ELDBUS_CFLAGS)
+
+libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS)
libdali_adaptor_la_LIBADD = \
$(DALICORE_LIBS) \
$(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
$(CAPI_APPFW_APPLICATION_LIBS) \
$(HARFBUZZ_LIBS) \
+ $(CAPI_SYSTEM_INFO_LIBS) \
+ $(ELDBUS_LIBS) \
-lgif \
- -lboost_thread
+ -lpthread \
+ -lboost_thread \
+ -lboost_system \
+ -lturbojpeg
if WAYLAND
libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS)
$(NATIVE_BUFFER_POOL_LIBS)
endif
-if LITE_PROFILE
-libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
-endif
-
if WEARABLE_PROFILE
libdali_adaptor_la_CXXFLAGS += \
$(HAPTIC_CFLAGS) \
libdali_adaptor_la_LIBADD +=
endif
-if TURBO_JPEG_IS_ON
-libdali_adaptor_la_LIBADD += -lturbojpeg
-CFLAGS += -D_TURBO_JPEG_LOADER
if UBUNTU_PROFILE
libdali_adaptor_la_LIBADD += -ljpeg
CFLAGS += -fPIC
endif
-else
-libdali_adaptor_la_LIBADD += -ljpeg
-endif
tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
+tizenadaptordevelapidir= $(devincludepath)/dali/devel-api
+
+tizenadaptorintegrationapidir = $(devincludepath)/dali/integration-api/adaptors
+tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files)
+
+if WAYLAND
+tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors
+tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files)
+else
+tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors
+tizenadaptorintegrationx11api_HEADERS = $(adaptor_integration_x11_api_header_files)
+endif
+
tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework
tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files)
-tizentextabstractionpublicapidir = $(tizenadaptorpublicapidir)/text-abstraction
-tizentextabstractionpublicapi_HEADERS = $(text_abstraction_header_files)
+tizenadaptorframeworkdevelapidir = $(tizenadaptordevelapidir)/adaptor-framework
+tizenadaptorframeworkdevelapi_HEADERS = $(devel_api_adaptor_framework_header_files)
+
+tizentextabstractiondevelapidir = $(tizenadaptordevelapidir)/text-abstraction
+tizentextabstractiondevelapi_HEADERS = $(text_abstraction_header_files)
+
+if !UBUNTU_PROFILE
+
+if !WAYLAND
+tizenadaptorframeworkdevelapi_HEADERS += $(devel_api_adaptor_tizen_x11_header_files)
+endif # NOT WAYLAND
+
+endif # NOT UBUNTU_PROFILE
tizenadaptordaliheaderdir = $(devincludepath)/dali
tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file)
install-data-local:
- $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliUserShaderCacheDir}
+ $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}
# Install resource log analyzer script
bin_SCRIPTS = ../../../adaptors/scripts/dalireslog.sh
# linking test
+# turn off the linker test if were building for libuv
+# We can't link to LibUV becase it is statically linked to Node.JS (by default)
+if !LIB_UV_EVENT_LOOP
noinst_PROGRAMS = linker.test
+endif # NOT LIB_UV_EVENT_LOOP
linker_test_SOURCES = linker-test.cpp
linker_test_CXXFLAGS = \
+ -DDALI_ADAPTOR_COMPILATION \
-I../../../adaptors/common \
-I../../../adaptors/public-api \
+ -I../../../adaptors/integration-api \
+ -I../../../adaptors/base/interfaces \
-I../../../adaptors/public-api/adaptor-framework \
+ -I../../../adaptors/devel-api/adaptor-framework \
$(DALI_ADAPTOR_CFLAGS) \
$(DALICORE_CFLAGS) \
$(VCONF_CFLAGS) \
$(DALIX11_CFLAGS) \
-Werror -Wall
+if WAYLAND
+linker_test_CXXFLAGS += \
+ -I../../../adaptors/integration-api/wayland
+else
+
+linker_test_CXXFLAGS += \
+ -I../../../adaptors/integration-api/x11
+endif
+
+
linker_test_DEPENDENCIES = libdali-adaptor.la
linker_test_LDADD = \
$(DALICORE_LIBS) \
projects / platform / core / uifw / dali-adaptor.git / blobdiff