projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 6127f3c)
Merge branch 'devel/master' into tizen
authorJoogab Yun <joogab.yun@samsung.com>
Wed, 28 Nov 2018 05:20:45 +0000 (14:20 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Wed, 28 Nov 2018 05:20:45 +0000 (14:20 +0900)
build/tizen/adaptor/Makefile.am patch | blob | history

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 2996179..9ab4793 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -596,6 +596,15 @@ LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg
 CFLAGS += -fPIC
 endif
 
+if !UBUNTU_PROFILE
+if WAYLAND
+else
+# X11
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(UTILX_CFLAGS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(UTILX_LIBS)
+endif
+endif
+
 tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
 tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
 
Domain: Graphics System / DALi;