Commit af9cf1929887c0da0b481a01b2978fcab5e59595
[dali_1.2.3] Merge branch 'devel/master'
Change-Id: I5c3cbc42af7295e62852a1d6984df1837d7c2c9c
Showing
3 changed files
with
4 additions
and
2 deletions
.gitignore
build/tizen/examples/CMakeLists.txt
| ... | ... | @@ -16,7 +16,8 @@ SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR}) |
| 16 | 16 | FOREACH(EXAMPLE ${SUBDIRS}) |
| 17 | 17 | FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp") |
| 18 | 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 | 21 | ENDIF() |
| 21 | 22 | ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS}) |
| 22 | 23 | TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_PKGS_LDFLAGS} -pie) | ... | ... |