projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Added Emscripten guide" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
build
/
tizen
/
configure.ac
diff --git
a/build/tizen/configure.ac
b/build/tizen/configure.ac
index
a0b795d
..
1fa0845
100644
(file)
--- a/
build/tizen/configure.ac
+++ b/
build/tizen/configure.ac
@@
-29,7
+29,6
@@
DALI_TOOLKIT_VERSION=dali_version
AC_SUBST(DALI_TOOLKIT_VERSION)
PKG_CHECK_MODULES(DALICORE, dali-core)
AC_SUBST(DALI_TOOLKIT_VERSION)
PKG_CHECK_MODULES(DALICORE, dali-core)
-PKG_CHECK_MODULES(DALI, dali)
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
@@
-84,6
+83,13
@@
AC_ARG_ENABLE([profile],
[dali_profile=$enableval],
[dali_profile=UBUNTU])
[dali_profile=$enableval],
[dali_profile=UBUNTU])
+# Tizen Style Folder
+AC_ARG_WITH(style,
+ [AC_HELP_STRING([--with-style],
+ [Select the style folder to use])],
+ [dali_style=$withval],
+ [dali_style=480x800])
+
# Ensure valid profile selected
if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xMOBILE" -a "x$dali_profile" != "xWEARABLE" -a "x$dali_profile" != "xTV" ; then
AC_MSG_ERROR([$enable_profile is an invalid profile])
# Ensure valid profile selected
if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xMOBILE" -a "x$dali_profile" != "xWEARABLE" -a "x$dali_profile" != "xTV" ; then
AC_MSG_ERROR([$enable_profile is an invalid profile])
@@
-103,14
+109,9
@@
fi
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
-# Style paths
-if test "x$dali_profile" = "xUBUNTU"; then
- STYLE_DIR=../../../dali-toolkit/styles
-fi
-
-if test "x$dali_profile" = "xMOBILE"; then
- STYLE_DIR=../../../dali-toolkit/styles/mobile
-fi
+# Style folder
+STYLE_DIR=../../../dali-toolkit/styles
+STYLE_DIR=$STYLE_DIR/$dali_style
AC_SUBST(STYLE_DIR)
AC_SUBST(STYLE_DIR)
@@
-177,4
+178,7
@@
Configuration
Profile: $dali_profile
Data Dir (Read/Write): $dataReadWriteDir
Data Dir (Read Only): $dataReadOnlyDir
Profile: $dali_profile
Data Dir (Read/Write): $dataReadWriteDir
Data Dir (Read Only): $dataReadOnlyDir
+ Style Dir: $STYLE_DIR
+ Style: $dali_style
+ i18n: $enable_i18n
"
"