Peter M. Groen / dali-demo

Commit 594401435c108814818ce7a6a1632a33e66b1f13

Authored by Paul Wisbey
Committed by Adeel Kazmi
1 parent 27cfb443

Changed build system to CMake 

Change-Id: Icc2f491187f7832425d18200fad4e4ea041dfd57
Inline Side-by-side
Showing 11 changed files with 200 additions and 359 deletions
@@ -43,7 +43,6 @@ To build the repository enter the 'build/tizen' folder: @@ -43,7 +43,6 @@ To build the repository enter the 'build/tizen' folder:
43 43
44 Then run the following commands: 44 Then run the following commands:
45 45
46 - autoreconf --install  
47 - ./configure --prefix=$DESKTOP_PREFIX 46 + cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX .
48 make install -j8 47 make install -j8
49 48
build/tizen/.gitignore
  View file @5944014
1 -/aclocal.m4  
2 -/autom4te.cache  
3 -/compile  
4 -/config.guess  
5 -/config.log  
6 -/config.status  
7 -/config.sub  
8 -/configure  
9 -/depcomp  
10 -/install-sh  
11 -/libtool  
12 -/ltmain.sh  
13 -/missing 1 +CMakeCache.txt
  2 +CMakeFiles/
  3 +cmake_install.cmake
  4 +demo/dali-demo
  5 +install_manifest.txt
14 /demo/dali-demo 6 /demo/dali-demo
15 /demo/dali-examples 7 /demo/dali-examples
16 /demo/dali-performance 8 /demo/dali-performance
build/tizen/CMakeLists.txt 0 → 100644
  View file @5944014
  1 +CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
  2 +PROJECT(dali-demo C CXX)
  3 +
  4 +SET(dali-demo_VERSION_MAJOR 1)
  5 +SET(dali-demo_VERSION_MINOR 0)
  6 +
  7 +SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
  8 +
  9 +SET(PREFIX ${CMAKE_INSTALL_PREFIX})
  10 +
  11 +IF(DEFINED DALI_APP_DIR)
  12 + SET(APP_DATA_DIR ${DALI_APP_DIR})
  13 + SET(BINDIR ${APP_DATA_DIR}/bin)
  14 +ELSE()
  15 + SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo)
  16 + SET(BINDIR ${PREFIX}/bin)
  17 +ENDIF()
  18 +
  19 +SET(LOCAL_IMAGES_DIR ${ROOT_SRC_DIR}/demo/images)
  20 +SET(LOCAL_MODELS_DIR ${ROOT_SRC_DIR}/demo/models)
  21 +SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts)
  22 +
  23 +SET(IMAGES_DIR ${APP_DATA_DIR}/images/)
  24 +SET(MODELS_DIR ${APP_DATA_DIR}/models/)
  25 +SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/)
  26 +
  27 +SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\")
  28 +SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\")
  29 +SET(DALI_SCRIPT_DIR \\"${SCRIPTS_DIR}\\")
  30 +SET(DALI_EXAMPLE_BIN \\"${BINDIR}/\\")
  31 +
  32 +FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
  33 +FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
  34 +FILE(GLOB LOCAL_IMAGES_GIF RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.gif")
  35 +FILE(GLOB LOCAL_IMAGES_BMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.bmp")
  36 +FILE(GLOB LOCAL_IMAGES_ICO RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.ico")
  37 +FILE(GLOB LOCAL_IMAGES_WBMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.wbmp")
  38 +
  39 +SET(LOCAL_IMAGES_LIST ${LOCAL_IMAGES_PNG};${LOCAL_IMAGES_JPG};${LOCAL_IMAGES_GIF};${LOCAL_IMAGES_BMP};${LOCAL_IMAGES_ICO};${LOCAL_IMAGES_WBMP})
  40 +FOREACH(flag ${LOCAL_IMAGES_LIST})
  41 + INSTALL(FILES ../../demo/images/${flag} DESTINATION ${IMAGES_DIR})
  42 +ENDFOREACH(flag)
  43 +
  44 +FILE(GLOB LOCAL_MODELS_LIST RELATIVE "${LOCAL_MODELS_DIR}" "${LOCAL_MODELS_DIR}/*")
  45 +FOREACH(flag ${LOCAL_MODELS_LIST})
  46 + INSTALL(FILES ../../demo/models/${flag} DESTINATION ${MODELS_DIR})
  47 +ENDFOREACH(flag)
  48 +
  49 +FILE(GLOB LOCAL_SCRIPTS_LIST RELATIVE "${LOCAL_SCRIPTS_DIR}" "${LOCAL_SCRIPTS_DIR}/*")
  50 +FOREACH(flag ${LOCAL_SCRIPTS_LIST})
  51 + INSTALL(FILES ../../demo/scripts/${flag} DESTINATION ${SCRIPTS_DIR})
  52 +ENDFOREACH(flag)
  53 +
  54 +SET(PKG_LIST dali
  55 + dali-toolkit)
  56 +
  57 +INCLUDE(FindPkgConfig)
  58 +pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
  59 +
  60 +FOREACH(flag ${REQUIRED_PKGS_CFLAGS})
  61 + SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
  62 +ENDFOREACH(flag)
  63 +
  64 +SET(DALI_DEMO_CFLAGS "-DDALI_IMAGE_DIR=${DALI_IMAGE_DIR} -DDALI_MODEL_DIR=${DALI_MODEL_DIR} -DDALI_SCRIPT_DIR=${DALI_SCRIPT_DIR} -DDALI_EXAMPLE_BIN=${DALI_EXAMPLE_BIN} -fvisibility=hidden -DHIDE_DALI_INTERNALS")
  65 +
  66 +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall")
  67 +SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
  68 +
  69 +INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
  70 +INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
  71 +
  72 +ADD_SUBDIRECTORY(demo)
  73 +ADD_SUBDIRECTORY(examples)
build/tizen/Makefile.am deleted
View file @27cfb44
1 -SUBDIRS = examples demo  
2 -  
3 -MAINTAINERCLEANFILES = \  
4 - aclocal.m4 \  
5 - autom4te.cache \  
6 - config.guess \  
7 - config.sub \  
8 - configure \  
9 - depcomp \  
10 - install-sh \  
11 - ltmain.sh \  
12 - missing \  
13 - `find "$(srcdir)" -type f -name Makefile.in -print` \  
14 - `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print`  
15 -  
16 -CLEANFILES = \  
17 - `find . \( -name "*.gcov" -o -name "*.gcno" -o -name "*.gcda" \) -print`  
build/tizen/configure.ac deleted
View file @27cfb44
1 -# Copyright (c) 2014 Samsung Electronics Co., Ltd.  
2 -  
3 -# Licensed under the Apache License, Version 2.0 (the "License");  
4 -# you may not use this file except in compliance with the License.  
5 -# You may obtain a copy of the License at  
6 -  
7 -# http://www.apache.org/licenses/LICENSE-2.0  
8 -  
9 -# Unless required by applicable law or agreed to in writing, software  
10 -# distributed under the License is distributed on an "AS IS" BASIS,  
11 -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
12 -# See the License for the specific language governing permissions and  
13 -# limitations under the License.  
14 -  
15 -  
16 -m4_define([dali_version],[0.1.0])  
17 -AC_INIT([dali], [dali_version])  
18 -AM_INIT_AUTOMAKE([-Wall foreign])  
19 -  
20 -AC_PROG_CXX  
21 -AC_PROG_LIBTOOL  
22 -  
23 -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])  
24 -  
25 -LT_INIT  
26 -  
27 -DALI_VERSION=dali_version  
28 -AC_SUBST(DALI_VERSION)  
29 -  
30 -PKG_CHECK_MODULES(DALI, dali)  
31 -PKG_CHECK_MODULES(DALI_TOOLKIT, dali-toolkit)  
32 -  
33 -DALIDEMO_CFLAGS=-DPLATFORM_SLP  
34 -  
35 -AC_ARG_ENABLE([debug],  
36 - [AC_HELP_STRING([--enable-debug],  
37 - [Turns on debugging])],  
38 - [enable_debug=$enableval],  
39 - [enable_debug=no])  
40 -  
41 -if test "x$enable_debug" = "xyes"; then  
42 - DALIDEMO_CFLAGS="$DALIDEMO_CFLAGS -DDEBUG_ENABLED"  
43 -fi  
44 -  
45 -if test x$DALI_APP_DIR != x; then  
46 - appdatadir=$DALI_APP_DIR  
47 - exedir=${appdatadir}/bin/  
48 -else  
49 - appdatadir=${prefix}/share/com.samsung.dali-demo/  
50 - exedir=${prefix}/bin/  
51 -fi  
52 -  
53 -AC_SUBST(datadir)  
54 -AC_SUBST(appdatadir)  
55 -AC_SUBST(exedir)  
56 -AC_SUBST(DALIDEMO_CFLAGS)  
57 -  
58 -dnl **************************************************************************  
59 -dnl ** Set Debian install Prefix **  
60 -dnl **************************************************************************  
61 -debian_prefix=${prefix#*/}  
62 -AC_SUBST(debian_prefix)  
63 -  
64 -AC_CONFIG_FILES([  
65 - Makefile  
66 - demo/Makefile  
67 - examples/Makefile  
68 -])  
69 -  
70 -  
71 -AC_OUTPUT  
72 -  
73 -echo "  
74 -Configuration  
75 --------------  
76 - Prefix: $prefix  
77 - Debug Build: $enable_debug  
78 - Application Data Dir: $appdatadir  
79 - Application Exe Dir: $exedir  
80 - DALIDEMO_CFLAGS: ${DALIDEMO_CFLAGS}  
81 -"  
build/tizen/demo/CMakeLists.txt 0 → 100644
  View file @5944014
  1 +SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo)
  2 +
  3 +AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS)
  4 +
  5 +ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS})
  6 +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS})
  7 +
  8 +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
build/tizen/demo/Makefile.am deleted
View file @27cfb44
1 -# Copyright (c) 2014 Samsung Electronics Co., Ltd.  
2 -  
3 -# Licensed under the Apache License, Version 2.0 (the "License");  
4 -# you may not use this file except in compliance with the License.  
5 -# You may obtain a copy of the License at  
6 -  
7 -# http://www.apache.org/licenses/LICENSE-2.0  
8 -  
9 -# Unless required by applicable law or agreed to in writing, software  
10 -# distributed under the License is distributed on an "AS IS" BASIS,  
11 -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
12 -# See the License for the specific language governing permissions and  
13 -# limitations under the License.  
14 -  
15 -  
16 -bin_PROGRAMS = \  
17 - dali-demo  
18 -  
19 -demo_src_dir = ../../../demo  
20 -include ../../../demo/file.list  
21 -  
22 -dalidemoimagesdir = $(appdatadir)/images/  
23 -dalidemoimages_DATA = $(demo_image_files)  
24 -  
25 -dalidemomodelsdir = $(appdatadir)/models/  
26 -dalidemomodels_DATA = $(demo_model_files)  
27 -  
28 -dalidemoshadersdir = $(appdatadir)/shaders/  
29 -dalidemoshaders_DATA = $(demo_shader_files)  
30 -  
31 -dalidemoscriptsdir = $(appdatadir)/scripts/  
32 -dalidemoscripts_DATA = $(demo_script_files)  
33 -  
34 -  
35 -DEMO_CXXFLAGS = -DDALI_IMAGE_DIR="\"$(dalidemoimagesdir)\"" \  
36 - -DDALI_MODEL_DIR="\"$(dalidemomodelsdir)\"" \  
37 - -DDALI_SCRIPT_DIR="\"$(dalidemoscriptsdir)\"" \  
38 - -DDALI_SHADER_DIR="\"$(dalidemoshadersdir)\"" \  
39 - -DDALI_EXAMPLE_BIN="\"$(exedir)\"" \  
40 - -I../../../demo -I../../.. \  
41 - $(DALIDEMO_CFLAGS) \  
42 - $(DALI_TOOLKIT_CFLAGS) \  
43 - $(DALI_CFLAGS) \  
44 - $(AUL_CFLAGS) \  
45 - -Werror -Wall  
46 -  
47 -DEMO_DEPS =  
48 -  
49 -DEMO_LDADD = $(DALI_LIBS) $(DALI_TOOLKIT_LIBS) $(AUL_LIBS)  
50 -  
51 -dali_demo_SOURCES = $(demo_src_files)  
52 -dali_demo_CXXFLAGS = $(DEMO_CXXFLAGS)  
53 -dali_demo_DEPENDENCIES = $(DEMO_DEPS)  
54 -dali_demo_LDADD = $(DEMO_LDADD)  
build/tizen/docs/Makefile.am deleted
View file @27cfb44
1 -all-local:  
2 - @rm -f doxygen-errors.txt  
3 - @-doxygen dali.doxy &> doxygen-errors.txt || rm doxygen-errors.txt  
4 - @touch doxygen-errors.txt  
5 - @cat doxygen-errors.txt  
6 - @if [ -s doxygen-errors.txt ]; then exit 1 ; fi  
7 - @rm doxygen-errors.txt  
build/tizen/examples/CMakeLists.txt 0 → 100644
  View file @5944014
  1 +SET(EXAMPLES_SRC_DIR ${ROOT_SRC_DIR}/examples)
  2 +
  3 +SET(BLOCKS_SRCS ${EXAMPLES_SRC_DIR}/blocks/blocks-example.cpp)
  4 +ADD_EXECUTABLE(blocks.example ${BLOCKS_SRCS})
  5 +TARGET_LINK_LIBRARIES(blocks.example ${REQUIRED_PKGS_LDFLAGS})
  6 +INSTALL(TARGETS blocks.example DESTINATION ${BINDIR})
  7 +
  8 +SET(BUBBLE_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/bubble-effect-example.cpp)
  9 +ADD_EXECUTABLE(bubble-effect.example ${BUBBLE_EFFECT_SRCS})
  10 +TARGET_LINK_LIBRARIES(bubble-effect.example ${REQUIRED_PKGS_LDFLAGS})
  11 +INSTALL(TARGETS bubble-effect.example DESTINATION ${BINDIR})
  12 +
  13 +SET(CLUSTER_SRCS ${EXAMPLES_SRC_DIR}/cluster/cluster-example.cpp)
  14 +ADD_EXECUTABLE(cluster.example ${CLUSTER_SRCS})
  15 +TARGET_LINK_LIBRARIES(cluster.example ${REQUIRED_PKGS_LDFLAGS})
  16 +INSTALL(TARGETS cluster.example DESTINATION ${BINDIR})
  17 +
  18 +SET(CUBE_TRANSITION_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/transition/cube-transition-effect-example.cpp)
  19 +ADD_EXECUTABLE(cube-transition-effect.example ${CUBE_TRANSITION_EFFECT_SRCS})
  20 +TARGET_LINK_LIBRARIES(cube-transition-effect.example ${REQUIRED_PKGS_LDFLAGS})
  21 +INSTALL(TARGETS cube-transition-effect.example DESTINATION ${BINDIR})
  22 +
  23 +SET(DISSOLVE_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/dissolve-effect-example.cpp)
  24 +ADD_EXECUTABLE(dissolve-effect.example ${DISSOLVE_EFFECT_SRCS})
  25 +TARGET_LINK_LIBRARIES(dissolve-effect.example ${REQUIRED_PKGS_LDFLAGS})
  26 +INSTALL(TARGETS dissolve-effect.example DESTINATION ${BINDIR})
  27 +
  28 +SET(HELLO_WORLD_SRCS ${EXAMPLES_SRC_DIR}/hello-world/hello-world-example.cpp)
  29 +ADD_EXECUTABLE(hello-world.example ${HELLO_WORLD_SRCS})
  30 +TARGET_LINK_LIBRARIES(hello-world.example ${REQUIRED_PKGS_LDFLAGS})
  31 +INSTALL(TARGETS hello-world.example DESTINATION ${BINDIR})
  32 +
  33 +SET(ITEM_VIEW_SRCS ${EXAMPLES_SRC_DIR}/item-view/item-view-example.cpp)
  34 +ADD_EXECUTABLE(item-view.example ${ITEM_VIEW_SRCS})
  35 +TARGET_LINK_LIBRARIES(item-view.example ${REQUIRED_PKGS_LDFLAGS})
  36 +INSTALL(TARGETS item-view.example DESTINATION ${BINDIR})
  37 +
  38 +SET(MAGNIFIER_SRCS ${EXAMPLES_SRC_DIR}/magnifier/magnifier-example.cpp)
  39 +ADD_EXECUTABLE(magnifier.example ${MAGNIFIER_SRCS})
  40 +TARGET_LINK_LIBRARIES(magnifier.example ${REQUIRED_PKGS_LDFLAGS})
  41 +INSTALL(TARGETS magnifier.example DESTINATION ${BINDIR})
  42 +
  43 +SET(MOTION_BLUR_SRCS ${EXAMPLES_SRC_DIR}/motion/motion-blur-example.cpp)
  44 +ADD_EXECUTABLE(motion-blur.example ${MOTION_BLUR_SRCS})
  45 +TARGET_LINK_LIBRARIES(motion-blur.example ${REQUIRED_PKGS_LDFLAGS})
  46 +INSTALL(TARGETS motion-blur.example DESTINATION ${BINDIR})
  47 +
  48 +SET(MOTION_STRETCH_SRCS ${EXAMPLES_SRC_DIR}/motion/motion-stretch-example.cpp)
  49 +ADD_EXECUTABLE(motion-stretch.example ${MOTION_STRETCH_SRCS})
  50 +TARGET_LINK_LIBRARIES(motion-stretch.example ${REQUIRED_PKGS_LDFLAGS})
  51 +INSTALL(TARGETS motion-stretch.example DESTINATION ${BINDIR})
  52 +
  53 +SET(NEW_WINDOW_SRCS ${EXAMPLES_SRC_DIR}/new-window/new-window-example.cpp)
  54 +ADD_EXECUTABLE(new-window.example ${NEW_WINDOW_SRCS})
  55 +TARGET_LINK_LIBRARIES(new-window.example ${REQUIRED_PKGS_LDFLAGS})
  56 +INSTALL(TARGETS new-window.example DESTINATION ${BINDIR})
  57 +
  58 +SET(PAGE_TURN_VIEW_SRCS ${EXAMPLES_SRC_DIR}/page-turn-view/page-turn-view-example.cpp)
  59 +ADD_EXECUTABLE(page-turn-view.example ${PAGE_TURN_VIEW_SRCS})
  60 +TARGET_LINK_LIBRARIES(page-turn-view.example ${REQUIRED_PKGS_LDFLAGS})
  61 +INSTALL(TARGETS page-turn-view.example DESTINATION ${BINDIR})
  62 +
  63 +AUX_SOURCE_DIRECTORY(${EXAMPLES_SRC_DIR}/radial-menu RADIAL_MENU_SRCS)
  64 +ADD_EXECUTABLE(radial-menu.example ${RADIAL_MENU_SRCS})
  65 +TARGET_LINK_LIBRARIES(radial-menu.example ${REQUIRED_PKGS_LDFLAGS})
  66 +INSTALL(TARGETS radial-menu.example DESTINATION ${BINDIR})
  67 +
  68 +SET(REFRACTION_EFFECT_SRCS ${EXAMPLES_SRC_DIR}/shader-effect/refraction-effect-example.cpp)
  69 +ADD_EXECUTABLE(refraction-effect.example ${REFRACTION_EFFECT_SRCS})
  70 +TARGET_LINK_LIBRARIES(refraction-effect.example ${REQUIRED_PKGS_LDFLAGS})
  71 +INSTALL(TARGETS refraction-effect.example DESTINATION ${BINDIR})
  72 +
  73 +SET(SCROLL_VIEW_SRCS ${EXAMPLES_SRC_DIR}/scroll-view/scroll-view-example.cpp)
  74 +ADD_EXECUTABLE(scroll-view.example ${SCROLL_VIEW_SRCS})
  75 +TARGET_LINK_LIBRARIES(scroll-view.example ${REQUIRED_PKGS_LDFLAGS})
  76 +INSTALL(TARGETS scroll-view.example DESTINATION ${BINDIR})
  77 +
  78 +SET(SHADOW_BONE_LIGHTING_SRCS ${EXAMPLES_SRC_DIR}/shadows/shadow-bone-lighting-example.cpp)
  79 +ADD_EXECUTABLE(shadow-bone-lighting.example ${SHADOW_BONE_LIGHTING_SRCS})
  80 +TARGET_LINK_LIBRARIES(shadow-bone-lighting.example ${REQUIRED_PKGS_LDFLAGS})
  81 +INSTALL(TARGETS shadow-bone-lighting.example DESTINATION ${BINDIR})
  82 +
  83 +SET(DALI_BUILDER_SRCS ${EXAMPLES_SRC_DIR}/builder/dali-builder.cpp)
  84 +ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS})
  85 +TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS})
  86 +INSTALL(TARGETS dali-builder DESTINATION ${BINDIR})
  87 +
  88 +SET(BUILDER_SRCS ${EXAMPLES_SRC_DIR}/builder/examples.cpp)
  89 +ADD_EXECUTABLE(builder.example ${BUILDER_SRCS})
  90 +TARGET_LINK_LIBRARIES(builder.example ${REQUIRED_PKGS_LDFLAGS})
  91 +INSTALL(TARGETS builder.example DESTINATION ${BINDIR})
  92 +
  93 +SET(IMAGE_SCALING_IRREGULAR_GRID_SRCS ${EXAMPLES_SRC_DIR}/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp)
  94 +ADD_EXECUTABLE(image-scaling-irregular-grid.example ${IMAGE_SCALING_IRREGULAR_GRID_SRCS})
  95 +TARGET_LINK_LIBRARIES(image-scaling-irregular-grid.example ${REQUIRED_PKGS_LDFLAGS})
  96 +INSTALL(TARGETS image-scaling-irregular-grid.example DESTINATION ${BINDIR})
  97 +
  98 +SET(BUTTONS_SRCS ${EXAMPLES_SRC_DIR}/buttons/buttons-example.cpp)
  99 +ADD_EXECUTABLE(buttons.example ${BUTTONS_SRCS})
  100 +TARGET_LINK_LIBRARIES(buttons.example ${REQUIRED_PKGS_LDFLAGS})
  101 +INSTALL(TARGETS buttons.example DESTINATION ${BINDIR})
  102 +
  103 +SET(TEXT_VIEW_SRCS ${EXAMPLES_SRC_DIR}/text-view/text-view-example.cpp)
  104 +ADD_EXECUTABLE(text-view.example ${TEXT_VIEW_SRCS})
  105 +TARGET_LINK_LIBRARIES(text-view.example ${REQUIRED_PKGS_LDFLAGS})
  106 +INSTALL(TARGETS text-view.example DESTINATION ${BINDIR})
  107 +
  108 +SET(LOGGING_SRCS ${EXAMPLES_SRC_DIR}/logging/logging-example.cpp)
  109 +ADD_EXECUTABLE(logging.example ${LOGGING_SRCS})
  110 +TARGET_LINK_LIBRARIES(logging.example ${REQUIRED_PKGS_LDFLAGS})
  111 +INSTALL(TARGETS logging.example DESTINATION ${BINDIR})
build/tizen/examples/Makefile.am deleted
View file @27cfb44
1 -# Copyright (c) 2014 Samsung Electronics Co., Ltd.  
2 -  
3 -# Licensed under the Apache License, Version 2.0 (the "License");  
4 -# you may not use this file except in compliance with the License.  
5 -# You may obtain a copy of the License at  
6 -  
7 -# http://www.apache.org/licenses/LICENSE-2.0  
8 -  
9 -# Unless required by applicable law or agreed to in writing, software  
10 -# distributed under the License is distributed on an "AS IS" BASIS,  
11 -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
12 -# See the License for the specific language governing permissions and  
13 -# limitations under the License.  
14 -  
15 -  
16 -examples_src_dir = ../../../examples  
17 -  
18 -bin_PROGRAMS = \  
19 - blocks.example \  
20 - bubble-effect.example \  
21 - cluster.example \  
22 - cube-transition-effect.example \  
23 - dissolve-effect.example \  
24 - hello-world.example \  
25 - item-view.example \  
26 - magnifier.example \  
27 - motion-blur.example \  
28 - motion-stretch.example \  
29 - new-window.example \  
30 - page-turn-view.example \  
31 - radial-menu.example \  
32 - refraction-effect.example \  
33 - scroll-view.example \  
34 - shadow-bone-lighting.example \  
35 - dali-builder \  
36 - builder.example \  
37 - image-scaling-irregular-grid.example \  
38 - buttons.example \  
39 - text-view.example \  
40 - logging.example  
41 -  
42 -  
43 -daliimagedir = $(appdatadir)/images/  
44 -dalimodeldir = $(appdatadir)/models/  
45 -daliscriptdir = $(appdatadir)/scripts/  
46 -  
47 -BASE_CXXFLAGS = -I../../../examples \  
48 - -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \  
49 - -DDALI_MODEL_DIR="\"${dalimodeldir}\"" \  
50 - -DDALI_SCRIPT_DIR="\"${daliscriptdir}\"" \  
51 - $(DALIDEMO_CFLAGS) \  
52 - $(ECORE_X_CFLAGS) \  
53 - $(CAPI_MEDIA_PLAYER_CFLAGS) \  
54 - $(CAPI_APPFW_APPLICATION_CFLAGS) \  
55 - -I/usr/include/media \  
56 - -Werror -Wall  
57 -  
58 -EXAMPLE_CXXFLAGS = $(DALI_CFLAGS) \  
59 - $(DALI_TOOLKIT_CFLAGS) \  
60 - $(BASE_CXXFLAGS)  
61 -  
62 -  
63 -EXAMPLE_DEPS =  
64 -  
65 -EXAMPLE_LDADD = $(DALI_LIBS) $(DALI_TOOLKIT_LIBS) $(ECORE_X_LIBS) $(CAPI_MEDIA_PLAYER_LIBS) $(CAPI_APPFW_APPLICATION_LIBS) -lrt -lEGL  
66 -  
67 -  
68 -blocks_example_SOURCES = $(examples_src_dir)/blocks/blocks-example.cpp  
69 -blocks_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
70 -blocks_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
71 -blocks_example_LDADD = $(EXAMPLE_LDADD)  
72 -  
73 -bubble_effect_example_SOURCES = $(examples_src_dir)/shader-effect/bubble-effect-example.cpp  
74 -bubble_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
75 -bubble_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
76 -bubble_effect_example_LDADD = $(EXAMPLE_LDADD)  
77 -  
78 -cluster_example_SOURCES = $(examples_src_dir)/cluster/cluster-example.cpp  
79 -cluster_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
80 -cluster_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
81 -cluster_example_LDADD = $(EXAMPLE_LDADD)  
82 -  
83 -cube_transition_effect_example_SOURCES = $(examples_src_dir)/transition/cube-transition-effect-example.cpp  
84 -cube_transition_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
85 -cube_transition_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
86 -cube_transition_effect_example_LDADD = $(EXAMPLE_LDADD)  
87 -  
88 -dissolve_effect_example_SOURCES = $(examples_src_dir)/shader-effect/dissolve-effect-example.cpp  
89 -dissolve_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
90 -dissolve_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
91 -dissolve_effect_example_LDADD = $(EXAMPLE_LDADD)  
92 -  
93 -hello_world_example_SOURCES = $(examples_src_dir)/hello-world/hello-world-example.cpp  
94 -hello_world_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
95 -hello_world_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
96 -hello_world_example_LDADD = $(EXAMPLE_LDADD)  
97 -  
98 -item_view_example_SOURCES = $(examples_src_dir)/item-view/item-view-example.cpp  
99 -item_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
100 -item_view_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
101 -item_view_example_LDADD = $(EXAMPLE_LDADD)  
102 -  
103 -magnifier_example_SOURCES = $(examples_src_dir)/magnifier/magnifier-example.cpp  
104 -magnifier_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
105 -magnifier_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
106 -magnifier_example_LDADD = $(EXAMPLE_LDADD)  
107 -  
108 -motion_blur_example_SOURCES = $(examples_src_dir)/motion/motion-blur-example.cpp  
109 -motion_blur_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
110 -motion_blur_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
111 -motion_blur_example_LDADD = $(EXAMPLE_LDADD)  
112 -  
113 -motion_stretch_example_SOURCES = $(examples_src_dir)/motion/motion-stretch-example.cpp  
114 -motion_stretch_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
115 -motion_stretch_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
116 -motion_stretch_example_LDADD = $(EXAMPLE_LDADD)  
117 -  
118 -new_window_example_SOURCES = $(examples_src_dir)/new-window/new-window-example.cpp  
119 -new_window_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
120 -new_window_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
121 -new_window_example_LDADD = $(EXAMPLE_LDADD)  
122 -  
123 -page_turn_view_example_SOURCES = $(examples_src_dir)/page-turn-view/page-turn-view-example.cpp  
124 -page_turn_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
125 -page_turn_view_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
126 -page_turn_view_example_LDADD = $(EXAMPLE_LDADD)  
127 -  
128 -radial_menu_example_SOURCES = $(examples_src_dir)/radial-menu/radial-menu-example.cpp \  
129 - $(examples_src_dir)/radial-menu/radial-sweep-view.cpp \  
130 - $(examples_src_dir)/radial-menu/radial-sweep-view-impl.cpp  
131 -radial_menu_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
132 -radial_menu_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
133 -radial_menu_example_LDADD = $(EXAMPLE_LDADD)  
134 -  
135 -refraction_effect_example_SOURCES = $(examples_src_dir)/shader-effect/refraction-effect-example.cpp  
136 -refraction_effect_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
137 -refraction_effect_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
138 -refraction_effect_example_LDADD = $(EXAMPLE_LDADD)  
139 -  
140 -scroll_view_example_SOURCES = $(examples_src_dir)/scroll-view/scroll-view-example.cpp  
141 -scroll_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
142 -scroll_view_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
143 -scroll_view_example_LDADD = $(EXAMPLE_LDADD)  
144 -  
145 -shadow_bone_lighting_example_SOURCES = $(examples_src_dir)/shadows/shadow-bone-lighting-example.cpp  
146 -shadow_bone_lighting_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
147 -shadow_bone_lighting_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
148 -shadow_bone_lighting_example_LDADD = $(EXAMPLE_LDADD)  
149 -  
150 -dali_builder_SOURCES = $(examples_src_dir)/builder/dali-builder.cpp  
151 -dali_builder_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
152 -dali_builder_DEPENDENCIES = $(EXAMPLE_DEPS)  
153 -dali_builder_LDADD = $(EXAMPLE_LDADD)  
154 -  
155 -builder_example_SOURCES = $(examples_src_dir)/builder/examples.cpp  
156 -builder_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
157 -builder_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
158 -builder_example_LDADD = $(EXAMPLE_LDADD)  
159 -  
160 -image_scaling_irregular_grid_example_SOURCES = $(examples_src_dir)/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp  
161 -image_scaling_irregular_grid_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
162 -image_scaling_irregular_grid_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
163 -image_scaling_irregular_grid_example_LDADD = $(EXAMPLE_LDADD)  
164 -  
165 -buttons_example_SOURCES = $(examples_src_dir)/buttons/buttons-example.cpp  
166 -buttons_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
167 -buttons_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
168 -buttons_example_LDADD = $(EXAMPLE_LDADD)  
169 -  
170 -text_view_example_SOURCES = $(examples_src_dir)/text-view/text-view-example.cpp  
171 -text_view_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
172 -text_view_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
173 -text_view_example_LDADD = $(EXAMPLE_LDADD)  
174 -  
175 -logging_example_SOURCES = $(examples_src_dir)/logging/logging-example.cpp  
176 -logging_example_CXXFLAGS = $(EXAMPLE_CXXFLAGS)  
177 -logging_example_DEPENDENCIES = $(EXAMPLE_DEPS)  
178 -logging_example_LDADD = $(EXAMPLE_LDADD)  
packaging/com.samsung.dali-demo.spec
  View file @5944014
@@ -14,6 +14,7 @@ Requires(postun): /sbin/ldconfig @@ -14,6 +14,7 @@ Requires(postun): /sbin/ldconfig
14 Requires: dali 14 Requires: dali
15 Requires: dali-adaptor 15 Requires: dali-adaptor
16 Requires: dali-toolkit 16 Requires: dali-toolkit
  17 +BuildRequires: cmake
17 BuildRequires: boost-devel 18 BuildRequires: boost-devel
18 BuildRequires: pkgconfig 19 BuildRequires: pkgconfig
19 BuildRequires: pkgconfig(capi-appfw-application) 20 BuildRequires: pkgconfig(capi-appfw-application)
@@ -47,13 +48,10 @@ CXXFLAGS+=" -Wall -g -O2" @@ -47,13 +48,10 @@ CXXFLAGS+=" -Wall -g -O2"
47 LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC" 48 LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -fPIC"
48 49
49 %ifarch %{arm} 50 %ifarch %{arm}
50 -EXTRA_CONFIGURE_OPTIONS=" --host=arm"  
51 CXXFLAGS+=" -D_ARCH_ARM_" 51 CXXFLAGS+=" -D_ARCH_ARM_"
52 %endif 52 %endif
53 53
54 -libtoolize --force  
55 -cd %{_builddir}/%{name}-%{version}/build/tizen && autoreconf --install  
56 -cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_APP_DIR=%{dali_app_ro_dir} ./configure --prefix=$PREFIX $EXTRA_CONFIGURE_OPTIONS 54 +cd %{_builddir}/%{name}-%{version}/build/tizen && cmake -DDALI_APP_DIR=%{dali_app_ro_dir} .
57 55
58 make %{?jobs:-j%jobs} 56 make %{?jobs:-j%jobs}
59 57
@@ -65,9 +63,6 @@ rm -rf %{buildroot} @@ -65,9 +63,6 @@ rm -rf %{buildroot}
65 cd build/tizen 63 cd build/tizen
66 %make_install DALI_APP_DIR=%{dali_app_ro_dir} 64 %make_install DALI_APP_DIR=%{dali_app_ro_dir}
67 65
68 -mkdir -p %{buildroot}/%{dali_app_exe_dir}  
69 -mv %{buildroot}/%{_bindir}/* %{buildroot}/%{dali_app_exe_dir}  
70 -  
71 mkdir -p %{buildroot}%{dali_xml_file_dir} 66 mkdir -p %{buildroot}%{dali_xml_file_dir}
72 cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_dir} 67 cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_dir}
73 68