X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fscripting%2Fscript-impl.cpp;h=6c9191ba084e95038b468ea601b3142db344d3c2;hp=a84ee70bdb0b0f6da3d4f3f263a18df4b0038d3e;hb=7c4829108a1196e07f0eb93207ea234e3741642b;hpb=2d1ba388f9a941d273e95d729b9662cc1cdad822

diff --git a/dali-toolkit/internal/scripting/script-impl.cpp b/dali-toolkit/internal/scripting/script-impl.cpp
index a84ee70..6c9191b 100644
--- a/dali-toolkit/internal/scripting/script-impl.cpp
+++ b/dali-toolkit/internal/scripting/script-impl.cpp
@@ -33,20 +33,18 @@ namespace Internal
 
 namespace
 {
+#if _GLIBCXX_USE_CXX11_ABI
+const char* PLUGIN_FILE = "libdali-script-plugin-v8-cxx11.so";
+#else
 const char* PLUGIN_FILE = "libdali-script-plugin-v8.so";
+#endif
 }
 
-Script::Script(void) : mPlugin(NULL)
+Script::Script()
+: mPlugin( NULL )
 {
   ScriptPluginProxy *plugin = new ScriptPluginProxy( PLUGIN_FILE );
 
-  if( mPlugin )
-  {
-    DALI_LOG_WARNING("Reloading script plugin %s, is this what you wanted to do?",PLUGIN_FILE);
-    delete mPlugin;
-    mPlugin = NULL;
-  }
-
   if( plugin->IsInitialized() )
   {
     mPlugin = plugin;
@@ -55,7 +53,6 @@ Script::Script(void) : mPlugin(NULL)
   {
     delete plugin;
   }
-
 }
 
 bool Script::ExecuteFile( const std::string& filename )