Peter M. Groen / dali-demo

Commit 10ca886e5488d45859d1880577fc8f065a07555e

Authored by taeyoon
Committed by Taeyoon Lee
1 parent ffec0c80

Working... Add missed tag and fix launch issue 

  - Fix mismatch between <ui...> and </ui..>
  - Add DALI_EXPORT_API
  TODO> Example launch issue in dali-demo

Change-Id: I3c685d79c725e08d3798eb9e906734effd1a2fd0
Inline Side-by-side
Showing 4 changed files with 4 additions and 3 deletions
build/tizen/demo/CMakeLists.txt
  View file @10ca886
@@ -3,7 +3,7 @@ SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo) @@ -3,7 +3,7 @@ SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo)
3 AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS) 3 AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS)
4 4
5 ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS}) 5 ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS})
6 -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS}) 6 +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)
7 7
8 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) 8 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
9 9
com.samsung.dali-demo.xml
  View file @10ca886
@@ -147,6 +147,7 @@ @@ -147,6 +147,7 @@
147 </ui-application> 147 </ui-application>
148 <ui-application appid="native-image-source.example" exec="/usr/apps/com.samsung.dali-demo/bin/native-image-source.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 148 <ui-application appid="native-image-source.example" exec="/usr/apps/com.samsung.dali-demo/bin/native-image-source.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
149 <label>Native Image Source</label> 149 <label>Native Image Source</label>
  150 + </ui-application>
150 <ui-application appid="perf-scroll.example" exec="/usr/apps/com.samsung.dali-demo/bin/perf-scroll.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 151 <ui-application appid="perf-scroll.example" exec="/usr/apps/com.samsung.dali-demo/bin/perf-scroll.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
151 <label>perf-scroll</label> 152 <label>perf-scroll</label>
152 </ui-application> 153 </ui-application>
demo/dali-demo.cpp
  View file @10ca886
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 24
25 using namespace Dali; 25 using namespace Dali;
26 26
27 -int main(int argc, char **argv) 27 +int DALI_EXPORT_API main(int argc, char **argv)
28 { 28 {
29 // Configure gettext for internalization 29 // Configure gettext for internalization
30 bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR); 30 bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR);
examples/perf-scroll/perf-scroll.cpp
  View file @10ca886
@@ -496,7 +496,7 @@ void RunTest( Application&amp; application ) @@ -496,7 +496,7 @@ void RunTest( Application&amp; application )
496 496
497 // Entry point for Linux & Tizen applications 497 // Entry point for Linux & Tizen applications
498 // 498 //
499 -int main( int argc, char **argv ) 499 +int DALI_EXPORT_API main( int argc, char **argv )
500 { 500 {
501 Application application = Application::New( &argc, &argv ); 501 Application application = Application::New( &argc, &argv );
502 502