Peter M. Groen / dali-demo

Commit 72080f7e1555878137da2aac337447773e7d131e

Authored by Francisco Santos
1 parent ca9c58c4

Remove AUL 

Change-Id: Id8dbb9439a3259dca94f737934cd711477b95626
Inline Side-by-side
Showing 3 changed files with 1 additions and 13 deletions
build/tizen/configure.ac
  View file @72080f7
@@ -29,9 +29,6 @@ AC_SUBST(DALI_VERSION) @@ -29,9 +29,6 @@ AC_SUBST(DALI_VERSION)
29 29
30 PKG_CHECK_MODULES(DALI, dali) 30 PKG_CHECK_MODULES(DALI, dali)
31 PKG_CHECK_MODULES(DALI_TOOLKIT, dali-toolkit) 31 PKG_CHECK_MODULES(DALI_TOOLKIT, dali-toolkit)
32 -PKG_CHECK_MODULES(AUL, aul,  
33 - [AC_DEFINE([HAS_AUL], [1])],  
34 - [1])  
35 32
36 DALIDEMO_CFLAGS=-DPLATFORM_SLP 33 DALIDEMO_CFLAGS=-DPLATFORM_SLP
37 34
demo/dali-table-view.cpp
  View file @72080f7
@@ -21,12 +21,7 @@ @@ -21,12 +21,7 @@
21 // EXTERNAL INCLUDES 21 // EXTERNAL INCLUDES
22 #include <algorithm> 22 #include <algorithm>
23 #include <sstream> 23 #include <sstream>
24 -  
25 -#ifdef USE_AUL  
26 -#include <aul.h>  
27 -#else  
28 #include<unistd.h> 24 #include<unistd.h>
29 -#endif // USE_AUL  
30 25
31 using namespace Dali; 26 using namespace Dali;
32 using namespace Dali::Toolkit; 27 using namespace Dali::Toolkit;
@@ -715,9 +710,7 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source ) @@ -715,9 +710,7 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source )
715 else 710 else
716 { 711 {
717 const Example& example( iter->second ); 712 const Example& example( iter->second );
718 -#ifdef USE_AUL  
719 - aul_open_app( example.name.c_str() );  
720 -#else // USE_AUL 713 +
721 std::stringstream stream; 714 std::stringstream stream;
722 stream << DALI_EXAMPLE_BIN << example.name.c_str(); 715 stream << DALI_EXAMPLE_BIN << example.name.c_str();
723 pid_t pid = fork(); 716 pid_t pid = fork();
@@ -726,7 +719,6 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source ) @@ -726,7 +719,6 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source )
726 execlp( stream.str().c_str(), example.name.c_str(), NULL ); 719 execlp( stream.str().c_str(), example.name.c_str(), NULL );
727 DALI_ASSERT_ALWAYS(false && "exec failed!"); 720 DALI_ASSERT_ALWAYS(false && "exec failed!");
728 } 721 }
729 -#endif // USE_AUL  
730 } 722 }
731 mPressedActor.Reset(); 723 mPressedActor.Reset();
732 } 724 }
packaging/com.samsung.dali-demo.spec
  View file @72080f7
@@ -18,7 +18,6 @@ BuildRequires: boost-devel @@ -18,7 +18,6 @@ BuildRequires: boost-devel
18 BuildRequires: pkgconfig 18 BuildRequires: pkgconfig
19 BuildRequires: pkgconfig(capi-appfw-application) 19 BuildRequires: pkgconfig(capi-appfw-application)
20 BuildRequires: pkgconfig(capi-media-player) 20 BuildRequires: pkgconfig(capi-media-player)
21 -BuildRequires: pkgconfig(aul)  
22 BuildRequires: dali-toolkit-devel 21 BuildRequires: dali-toolkit-devel
23 BuildRequires: dali-adaptor-devel 22 BuildRequires: dali-adaptor-devel
24 BuildRequires: pkgconfig(dlog) 23 BuildRequires: pkgconfig(dlog)