X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=bf01089e14ebaa989879c4326b3798f8ce6f8321;hb=71f634bea9b141bfaa79342e2b7783c6ec5667ee;hp=be88f34d46807b92425eeb28afa0bae7bfad05ee;hpb=0fc3de99a7023b931995b1c708476241a7c2d41e;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index be88f34..bf01089 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2014 Samsung Electronics Co., Ltd. +# Copyright (c) 2017 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. @@ -40,29 +40,16 @@ include ../../../adaptors/integration-api/file.list adaptor_common_dir = ../../../adaptors/common include ../../../adaptors/common/file.list -if USE_EFL # ECore Common adaptor_ecore_common_dir = ../../../adaptors/ecore/common include ../../../adaptors/ecore/common/file.list -else -# If we're not using any EFL, then we need to use libuv mainloop -# for the frame work -adaptor_libuv_dir = ../../../adaptors/libuv -include ../../../adaptors/libuv/file.list -endif # Wayland if WAYLAND -if USE_EFL ## Use ecore_wayland adaptor_ecore_wayland_dir = ../../../adaptors/ecore/wayland include ../../../adaptors/ecore/wayland/file.list else -## Use wayland -adaptor_wayland_dir = ../../../adaptors/wayland -include ../../../adaptors/wayland/file.list -endif -else # X11 adaptor_x11_dir = ../../../adaptors/x11 include ../../../adaptors/x11/file.list @@ -73,10 +60,15 @@ if UBUNTU_PROFILE adaptor_ubuntu_dir = ../../../adaptors/ubuntu include ../../../adaptors/ubuntu/file.list else + # Tizen adaptor_tizen_dir = ../../../adaptors/tizen +if USE_APPFW_EFL_BASE +include ../../../adaptors/tizen/file-3.list +else include ../../../adaptors/tizen/file.list endif +endif # Mobile adaptor_mobile_dir = ../../../adaptors/mobile @@ -114,16 +106,8 @@ package_doxy_dir = ../../../doc include ../../../doc/file.list ############# source files ############# - -# FRAMEWORK FILES for adaptor -# Either use ecore mainloop + appcore / uiman -# Or libuv main loop with no appcore / uimain -if USE_EFL adaptor_internal_src_files = $(adaptor_tizen_framework_efl_src_files) \ $(adaptor_ecore_common_internal_src_files) -else -adaptor_internal_src_files = $(adaptor_tizen_framework_libuv_src_files) -endif # COMMON if COMMON_PROFILE @@ -273,17 +257,8 @@ endif # WAYLAND endif # IVI_PROFILE - - -# 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 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 if ENABLE_VECTOR_BASED_TEXT_RENDERING adaptor_internal_src_files += $(static_libraries_glyphy_src_files) @@ -379,7 +354,7 @@ libdali_adaptor_la_CXXFLAGS = \ -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ - -Werror -Wall -lgcc \ + -Werror -Wall -lgcc -Wold-style-cast\ $(libdali_adaptor_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ $(DALICORE_CFLAGS) \ @@ -395,7 +370,6 @@ libdali_adaptor_la_CXXFLAGS = \ $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ - $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) \ $(UTILX_CFLAGS) @@ -423,7 +397,6 @@ libdali_adaptor_la_LIBADD = \ $(CAPI_SYSTEM_SENSOR_LIBS) \ $(LIBDRM_LIBS) \ $(LIBEXIF_LIBS) \ - $(SCREENCONNECTORPROVIDER_LIBS) \ $(LIBCURL_LIBS) \ $(HARFBUZZ_LIBS) \ $(TPKP_CURL_LIBS) \ @@ -433,22 +406,18 @@ libdali_adaptor_la_LIBADD = \ -lturbojpeg \ -ljpeg -if USE_EFL # EVAS used indicator libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS) \ $(EVAS_CFLAGS) \ $(ECORE_CFLAGS) \ $(ECORE_IPC_CFLAGS) \ - $(ELDBUS_CFLAGS) \ - -DUSE_EFL + $(ELDBUS_CFLAGS) libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS) \ $(ECORE_IPC_LIBS) \ $(ELDBUS_LIBS) -endif - if USE_APPFW libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \ @@ -462,8 +431,18 @@ libdali_adaptor_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ $(CAPI_SYSTEM_INFO_LIBS) \ $(TTS_LIBS) \ $(SENSOR_LIBS) +if USE_APPFW_EFL_BASE +else +libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \ + $(CAPI_APPFW_CONTROL_CFLAGS) \ + $(FRIBIDI_CFLAGS) +libdali_adaptor_la_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \ + $(CAPI_APPFW_CONTROL_LIBS) \ + $(FRIBIDI_LIBS) endif +endif + if WAYLAND # This is to avoid having to include wayland-egl.h everywhere libdali_adaptor_la_CXXFLAGS += -DWL_EGL_PLATFORM @@ -495,10 +474,12 @@ endif if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ - $(EFL_ASSIST_CFLAGS) + $(EFL_ASSIST_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(APPCORE_WATCH_CFLAGS) libdali_adaptor_la_LIBADD += \ + $(SCREENCONNECTORPROVIDER_LIBS) \ $(APPCORE_WATCH_LIBS) endif @@ -588,12 +569,7 @@ packagedoxydir = $(devincludepath)/dali/doc packagedoxy_HEADERS = $(package_doxy_files) # 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