Merge branch 'tizen' into devel/new_mesh

.

Change-Id: Ic6d3c6e1cc6dff2dbf9064797e766ed88ec3deaa

diff --cc build/tizen/adaptor/Makefile.am
Simple merge

diff --cc build/tizen/configure.ac
index ca772fa,6cfa86b..09c31f1
--- 1/build/tizen/configure.ac
--- 2/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@@ -99,6 -105,16 +105,10 @@@ if test "x$enable_debug" = "xno" -a "x$
    DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
  fi
  
 -AC_ARG_ENABLE([assimp],
 -              [AC_HELP_STRING([--enable-assimp],
 -                              [Enable assimp plugin, overriding platform defaults])],
 -              [enable_assimp=yes],
 -              [enable_assimp=no])
 -
+ if test "x$enable_shaderbincache" = "xENABLE"; then
+   DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DSHADERBIN_CACHE_ENABLED"
+ fi
+ 
  AC_ARG_ENABLE([gles],
                [AC_HELP_STRING([--enable-gles],
                                [Specify the OpenGL ES version for backwards compatibility])],