summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0b656e1)
"feedback-style.cpp" can't find default-feedback-theme.json file because json file is not installed to
${PREFIX}/share/dali/toolkit/styles folder.
To fix this, make default-feedback-theme.json be installed to ${PREFIX}/dali/toolkit/styles folder
Change-Id: I1a4944c46187c3710c1b635366bdb119eb45c372
Signed-off-by: minho.sun <minho.sun@samsung.com>
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
+# Copyright (c) 2016 Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
# Style folder
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
# Style folder
-STYLE_DIR=../../../dali-toolkit/styles
-STYLE_DIR=$STYLE_DIR/$dali_style
+STYLE_BASE_DIR=../../../dali-toolkit/styles
+STYLE_DIR=$STYLE_BASE_DIR/$dali_style
+AC_SUBST(STYLE_BASE_DIR)
AC_SUBST(STYLE_DIR)
# v8 version 4+ requires c++11
AC_SUBST(STYLE_DIR)
# v8 version 4+ requires c++11
devel_api_src_dir = ../../../dali-toolkit/devel-api
third_party_src_dir = ../../../dali-toolkit/third-party
devel_api_src_dir = ../../../dali-toolkit/devel-api
third_party_src_dir = ../../../dali-toolkit/third-party
+toolkit_styles_base_dir = ${STYLE_BASE_DIR}
toolkit_styles_dir = $(STYLE_DIR)
toolkit_style_images_dir = $(STYLE_DIR)/images
toolkit_styles_dir = $(STYLE_DIR)
toolkit_style_images_dir = $(STYLE_DIR)/images
# Files to install here
dali_toolkit_style_files =\
# Files to install here
dali_toolkit_style_files =\
+ $(toolkit_styles_base_dir)/*.json \
$(toolkit_styles_dir)/*.json
dali_toolkit_style_images =\
$(toolkit_styles_dir)/*.json
dali_toolkit_style_images =\