projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-adaptor.git]
/
build
/
tizen
/
adaptor
/
Makefile.am
diff --git
a/build/tizen/adaptor/Makefile.am
b/build/tizen/adaptor/Makefile.am
index
75eb325
..
d04baf7
100644
(file)
--- a/
build/tizen/adaptor/Makefile.am
+++ b/
build/tizen/adaptor/Makefile.am
@@
-523,6
+523,15
@@
libdali_adaptor_la_LIBADD += -ljpeg
CFLAGS += -fPIC
endif
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)
tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
tizenadaptorpublicapi_HEADERS = $(public_api_header_files)