X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=a1c1059e48bcfd35dfb94a7c583eb335078a47db;hb=26117d407b8ff8da1854f0b8cc85c14625fe1595;hp=358aeae9910c8996f614ff19b2ce8fb3073ae6f7;hpb=d7fcb48e5bf25299817fa720af2133badb4e9d44;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 358aeae..a1c1059 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -127,14 +127,19 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(static_libraries_libunibreak_src_files) if WAYLAND + if USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) \ $(adaptor_ecore_wayland_internal_default_profile_src_files) else adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) -endif +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ + $(adaptor_tizen_internal_native_image_src_files) else adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) \ $(adaptor_x11_internal_default_profile_src_files) endif # WAYLAND endif # COMMON_PROFILE @@ -148,7 +153,8 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(adaptor_ubuntu_internal_src_files) \ $(adaptor_x11_ubuntu_internal_src_files) \ $(adaptor_x11_internal_default_profile_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # UBUNTU_PROFILE @@ -162,13 +168,18 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(static_libraries_libunibreak_src_files) if WAYLAND + if USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) else adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) -endif +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ + $(adaptor_tizen_internal_native_image_src_files) else -adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) +adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # WAYLAND endif # MOBILE_PROFILE @@ -181,13 +192,18 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(adaptor_tizen_internal_src_files) \ $(static_libraries_libunibreak_src_files) if WAYLAND + if USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) else adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) -endif +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ + $(adaptor_tizen_internal_native_image_src_files) else -adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) +adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # WAYLAND endif # WEARABLE @@ -202,14 +218,19 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(adaptor_tizen_internal_non_mobile_src_files) \ $(static_libraries_libunibreak_src_files) if WAYLAND + if USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) else adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) -endif +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ + $(adaptor_tizen_internal_native_image_src_files) else adaptor_internal_src_files += $(adaptor_x11_tv_internal_src_files) \ - $(adaptor_x11_internal_tv_profile_key_src_files) + $(adaptor_x11_internal_tv_profile_key_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # WAYLAND endif @@ -268,6 +289,7 @@ libdali_adaptor_la_includes = \ if WAYLAND libdali_adaptor_la_includes += -I../../../adaptors/integration-api/wayland + if USE_ECORE_WAYLAND libdali_adaptor_la_includes += \ -I../../../adaptors/ecore/common \ @@ -275,15 +297,17 @@ libdali_adaptor_la_includes += \ else libdali_adaptor_la_includes += -I../../../adaptors/wayland \ -I../../../adaptors/wayland/imf \ - -I../../../adaptors/wayland/clipboard \ - -I../../../adaptors/wayland/native-image -endif + -I../../../adaptors/wayland/clipboard +endif # USE_ECORE_WAYLADN + +libdali_adaptor_la_includes += \ + -I../../../adaptors/tizen else libdali_adaptor_la_includes += \ -I../../../adaptors/ecore/common \ -I../../../adaptors/x11 \ -I../../../adaptors/integration-api/x11 -endif +endif # WAYLAND if UBUNTU_PROFILE libdali_adaptor_la_includes += \