projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a689b2c)
Merge branch 'devel/master' into tizen accepted/tizen/unified/20190410.061746 submit/tizen/20190409.081337
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 9 Apr 2019 06:06:29 +0000 (15:06 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 9 Apr 2019 06:06:34 +0000 (15:06 +0900)
Change-Id: I6992d7ba75bb64f888d37d52e43916253db411a1

build/tizen/adaptor/Makefile.am patch | blob | history

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 8a79d7d..d62e6ff 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -590,6 +590,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;