X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fconfigure.ac;h=b379480e9aeff578945b4fccf679858ecb9ff0d2;hb=418d4f93f7158ef267ab389106f831033671c880;hp=47442e4c881ceac71939f4df31b4d214c97994f0;hpb=4eae08ff442d3768ba2c688f5c543ebe701c2fea;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 47442e4..b379480 100644
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -30,6 +30,9 @@ AC_SUBST(DALI_VERSION)
 
 DALI_CFLAGS=-DPLATFORM_TIZEN
 
+# Use C++ 11
+DALI_CFLAGS="$DALI_CFLAGS -std=c++11 -Wnon-virtual-dtor"
+
 AC_ARG_ENABLE(exportall,
               [AC_HELP_STRING([--enable-exportall],
                               [enables the exporting of all the symbols in the library])],
@@ -54,11 +57,19 @@ AC_ARG_ENABLE([backtrace],
               [enable_backtrace=$enableval],
               [enable_backtrace=yes])
 
-AC_ARG_ENABLE([dynamics],
-              [AC_HELP_STRING([--enable-dynamics],
-                              [Builds with dynamics support])],
-              [dynamics_support=$enableval],
-              [dynamics_support=no])
+AC_ARG_ENABLE([lock_backtrace],
+              [AC_HELP_STRING([--enable-lock-backtrace],
+                              [Backtrace for when more than 1 lock is held on the same thread])],
+              [enable_lock_backtrace=$enableval],
+              [enable_lock_backtrace=no])
+
+AC_ARG_ENABLE([gles],
+              [AC_HELP_STRING([--enable-gles],
+                              [Specify the OpenGL ES version for backwards compatibility])],
+              [enable_gles=$enableval],
+              [enable_gles=20])
+
+DALI_CFLAGS="$DALI_CFLAGS -DDALI_GLES_VERSION=${enable_gles}"
 
 if test "x$enable_debug" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
@@ -70,24 +81,22 @@ fi
 
 if test "x$enable_emscripten" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DEMSCRIPTEN -std=c++11"
-  # Automatically turn off backtrace support
+  # Automatically turn off backtrace support and mutex locks
   enable_backtrace="no"
+  enable_lock_backtrace="no"
 fi
 
-DYNAMICS_SUPPORT=
-if test "x$dynamics_support" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -DDYNAMICS_SUPPORT"
-  DYNAMICS_SUPPORT=-DDYNAMICS_SUPPORT
+# Must come after Emscripten feature test
+if test "x$enable_lock_backtrace" = "xyes"; then
+  DALI_CFLAGS="$DALI_CFLAGS -DLOCK_BACKTRACE_ENABLED"
+  enable_backtrace="yes"
 fi
-AC_SUBST(DYNAMICS_SUPPORT)
 
-# Must come after Emscripten feature test
+# Must come after Emscripten & locks backtrace feature test
 if test "x$enable_backtrace" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DBACKTRACE_ENABLED"
 fi
 
-AM_CONDITIONAL([DYNAMICS_SUPPORT], [test x$dynamics_support = xyes])
-
 if test x$DALI_DATA_RW_DIR != x; then
   dataReadWriteDir=$DALI_DATA_RW_DIR
 else
@@ -116,8 +125,6 @@ AC_CONFIG_FILES([
  Makefile
  dali-core/Makefile
  dali-core.pc
- ../../automated-tests/CMakeLists.txt
- ../../automated-tests/src/dali/CMakeLists.txt
 ])
 
 AC_OUTPUT
@@ -131,5 +138,5 @@ Configuration
   Data Dir (Read Only):             $dataReadOnlyDir
   Emscripten:                       $enable_emscripten
   Backtrace:                        $enable_backtrace
-  Dynamics:                         $dynamics_support
+  ScopedLock Backtrace:             $enable_lock_backtrace
 "