Peter M. Groen / dali-demo

Commit ca9c58c4217b236ac061c8ea87086b41b620ff02

Authored by Francisco Santos
1 parent 0d95ef44

Make dependency in AUL optional. 

Change-Id: Ibe77ec3bf58765a823be772f7fe4033d8447b26a
Inline Side-by-side
Showing 3 changed files with 21 additions and 5 deletions
build/tizen/.gitignore
  View file @ca9c58c
1 /aclocal.m4 1 /aclocal.m4
2 /autom4te.cache 2 /autom4te.cache
  3 +/compile
3 /config.guess 4 /config.guess
4 /config.log 5 /config.log
5 /config.status 6 /config.status
build/tizen/configure.ac
  View file @ca9c58c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 m4_define([dali_version],[0.1.0]) 16 m4_define([dali_version],[0.1.0])
17 AC_INIT([dali], [dali_version]) 17 AC_INIT([dali], [dali_version])
18 -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) 18 +AM_INIT_AUTOMAKE([-Wall foreign])
19 19
20 AC_PROG_CXX 20 AC_PROG_CXX
21 AC_PROG_LIBTOOL 21 AC_PROG_LIBTOOL
@@ -29,10 +29,9 @@ AC_SUBST(DALI_VERSION) @@ -29,10 +29,9 @@ 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(CAPI_MEDIA_PLAYER, capi-media-player)  
33 -PKG_CHECK_MODULES(CAPI_APPFW_APPLICATION, capi-appfw-application)  
34 -PKG_CHECK_MODULES(AUL, aul)  
35 -PKG_CHECK_MODULES(DLOG, dlog) 32 +PKG_CHECK_MODULES(AUL, aul,
  33 + [AC_DEFINE([HAS_AUL], [1])],
  34 + [1])
36 35
37 DALIDEMO_CFLAGS=-DPLATFORM_SLP 36 DALIDEMO_CFLAGS=-DPLATFORM_SLP
38 37
demo/dali-table-view.cpp
  View file @ca9c58c
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
21 // EXTERNAL INCLUDES 21 // EXTERNAL INCLUDES
22 #include <algorithm> 22 #include <algorithm>
23 #include <sstream> 23 #include <sstream>
  24 +
  25 +#ifdef USE_AUL
24 #include <aul.h> 26 #include <aul.h>
  27 +#else
  28 +#include<unistd.h>
  29 +#endif // USE_AUL
25 30
26 using namespace Dali; 31 using namespace Dali;
27 using namespace Dali::Toolkit; 32 using namespace Dali::Toolkit;
@@ -710,7 +715,18 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source ) @@ -710,7 +715,18 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation&amp; source )
710 else 715 else
711 { 716 {
712 const Example& example( iter->second ); 717 const Example& example( iter->second );
  718 +#ifdef USE_AUL
713 aul_open_app( example.name.c_str() ); 719 aul_open_app( example.name.c_str() );
  720 +#else // USE_AUL
  721 + std::stringstream stream;
  722 + stream << DALI_EXAMPLE_BIN << example.name.c_str();
  723 + pid_t pid = fork();
  724 + if( pid == 0)
  725 + {
  726 + execlp( stream.str().c_str(), example.name.c_str(), NULL );
  727 + DALI_ASSERT_ALWAYS(false && "exec failed!");
  728 + }
  729 +#endif // USE_AUL
714 } 730 }
715 mPressedActor.Reset(); 731 mPressedActor.Reset();
716 } 732 }