X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor-uv%2FMakefile.am;h=07d093fc5cc9abdd7a6931524b6643e98b4088fa;hb=187c803816b8a8327d7d126e57eb606f30572d05;hp=e3aab676c710edd428400c524443a35cbf14ea26;hpb=e22af6c85a8bdd7c24d0a8d004177668810beb03;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am old mode 100755 new mode 100644 index e3aab67..07d093f --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -364,7 +364,6 @@ libdali_adaptor_uv_la_CXXFLAGS = \ -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ - -DWAYLAND_EXTENSIONS_SUPPORTED \ -Werror -Wall -lgcc \ $(libdali_adaptor_uv_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ @@ -383,7 +382,15 @@ libdali_adaptor_uv_la_CXXFLAGS = \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) -libdali_adaptor_uv_la_CFLAGS = $(libdali_adaptor_uv_la_CXXFLAGS) +# Todo, as soon as common repos are updated on build server remove this. +if !COMMON_PROFILE +libdali_adaptor_uv_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED +endif + +libdali_adaptor_uv_la_CFLAGS = \ + -Werror -Wall \ + -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ + $(DALI_ADAPTOR_CFLAGS) libdali_adaptor_uv_la_LIBADD = \ $(DALICORE_LIBS) \ @@ -420,12 +427,15 @@ libdali_adaptor_uv_la_LIBADD += $(ELEMENTARY_LIBS) \ else -if !UBUNTU_PROFILE libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS) libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS) -endif # !UBUNTU_PROFILE -endif # USE_EFL +if IVI_PROFILE +libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS) +libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS) +endif + +endif if USE_APPFW