Peter M. Groen / dali-demo

Commit af9cf1929887c0da0b481a01b2978fcab5e59595

Authored by Umar
2 parents af6c5341 b098cb9c

[dali_1.2.3] Merge branch 'devel/master' 

Change-Id: I5c3cbc42af7295e62852a1d6984df1837d7c2c9c
Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
.gitignore
  View file @af9cf19
@@ -38,3 +38,4 @@ dali-builder @@ -38,3 +38,4 @@ dali-builder
38 *.mo 38 *.mo
39 demo-theme.json 39 demo-theme.json
40 simple-image-wall.js 40 simple-image-wall.js
  41 +/shared/resources-location.cpp
build/tizen/examples/CMakeLists.txt
  View file @af9cf19
@@ -16,7 +16,8 @@ SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR}) @@ -16,7 +16,8 @@ SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
16 FOREACH(EXAMPLE ${SUBDIRS}) 16 FOREACH(EXAMPLE ${SUBDIRS})
17 FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp") 17 FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
18 IF(NOT DEFINED DALI_APP_RES_DIR) 18 IF(NOT DEFINED DALI_APP_RES_DIR)
19 - SET( DEMO_SRCS ${DEMO_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp") 19 + SET( SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
  20 +
20 ENDIF() 21 ENDIF()
21 ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS}) 22 ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
22 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_PKGS_LDFLAGS} -pie) 23 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_PKGS_LDFLAGS} -pie)
packaging/com.samsung.dali-demo.spec
  View file @af9cf19
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.2.2 5 +Version: 1.2.3
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0