projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
8144333
)
Merge branch 'devel/master' into tizen
author
Sunghyun kim
<scholb.kim@samsung.com>
Mon, 3 Sep 2018 02:12:03 +0000
(11:12 +0900)
committer
Sunghyun kim
<scholb.kim@samsung.com>
Mon, 3 Sep 2018 02:12:03 +0000
(11:12 +0900)
build/tizen/adaptor/Makefile.am
patch
|
blob
|
history
diff --git
a/build/tizen/adaptor/Makefile.am
b/build/tizen/adaptor/Makefile.am
index
9c506a9
..
2fad247
100644
(file)
--- a/
build/tizen/adaptor/Makefile.am
+++ b/
build/tizen/adaptor/Makefile.am
@@
-586,6
+586,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)