From 9906e31e6bfb98d1a9d0b876444a9084ffd86961 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Tue, 19 Apr 2016 20:33:34 +0200 Subject: [PATCH] fix sdk build Comment out tizen shell dependency as it is not a part of private SDK rootstrap. Add missing exportMap file and append missing source file references in project_def.prop file. Change-Id: Ib39e37aec2d6c4b0e56eb19e2060aa00b2d68356 --- .cproject | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ .exportMap | 4 + .project | 52 +++++ project_def.prop | 2 +- src/window.c | 6 + 5 files changed, 672 insertions(+), 1 deletion(-) create mode 100644 .cproject create mode 100644 .exportMap create mode 100644 .project diff --git a/.cproject b/.cproject new file mode 100644 index 0000000..170a2f9 --- /dev/null +++ b/.cproject @@ -0,0 +1,609 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.exportMap b/.exportMap new file mode 100644 index 0000000..43e310e --- /dev/null +++ b/.exportMap @@ -0,0 +1,4 @@ +{ + global: main; + local: *; +}; diff --git a/.project b/.project new file mode 100644 index 0000000..234ce45 --- /dev/null +++ b/.project @@ -0,0 +1,52 @@ + + + lockscreen + + + + + + org.tizen.nativecore.apichecker.apicheckerbuilder + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.tizen.nativecore.apichecker.apicheckernature + + + + 1461242128945 + + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-matches-false-false-*/.tpk + + + + 1461242128994 + + 6 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-project_def.prop + + + + diff --git a/project_def.prop b/project_def.prop index 43c99f7..db512e9 100644 --- a/project_def.prop +++ b/project_def.prop @@ -9,7 +9,7 @@ type = app profile = mobile-3.0 # C Sources -USER_SRCS = src/background.c src/battery.c src/battery_ctrl.c src/camera.c src/camera_ctrl.c src/display.c src/lockscreen.c src/main_ctrl.c src/main_view.c src/minicontrollers.c src/events.c src/sim.c src/sim_ctrl.c src/time_format.c src/time_format_ctrl.c src/util.c src/util_time.c src/window.c +USER_SRCS = src/background.c src/battery.c src/battery_ctrl.c src/camera.c src/camera_ctrl.c src/display.c src/lockscreen.c src/main_ctrl.c src/main_view.c src/minicontrollers.c src/events.c src/sim.c src/sim_ctrl.c src/time_format.c src/time_format_ctrl.c src/util.c src/util_time.c src/window.c src/events_view.c src/events_ctrl.c src/camera_view.c # EDC Sources USER_EDCS = diff --git a/src/window.c b/src/window.c index c0bd2bd..314f001 100644 --- a/src/window.c +++ b/src/window.c @@ -15,7 +15,9 @@ */ #include +#ifdef USE_TIZEN_SHELL #include +#endif #include "window.h" #include "log.h" @@ -45,8 +47,10 @@ static void _lockscreen_window_event_rect_geometry_changed_cb(void *data, Evas * Evas_Object *lockscreen_window_create(void) { +#ifdef USE_TIZEN_SHELL tzsh_h tzsh = NULL; tzsh_lockscreen_service_h lockscreen_service = NULL; +#endif Evas_Object *win = elm_win_add(NULL, "LOCKSCREEN", ELM_WIN_NOTIFICATION); if (!win) return NULL; @@ -58,6 +62,7 @@ Evas_Object *lockscreen_window_create(void) elm_win_fullscreen_set(win, EINA_TRUE); elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_SHOW); +#ifdef USE_TIZEN_SHELL tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); if (!tzsh) { ERR("tzsh_create failed"); @@ -72,6 +77,7 @@ Evas_Object *lockscreen_window_create(void) evas_object_del(win); return NULL; } +#endif Evas_Object *conformant = elm_conformant_add(win); evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -- 2.7.4