From 6704fa158cac0ffdbaf0ac62b0a80164a3e43cb8 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Mon, 13 Oct 2014 21:50:14 +0900 Subject: [PATCH] eventcast: fix build errors - add missing Makefile.objs. - modify header path. - add stub function in case of disable-sdl and disable-shm. Change-Id: Ib35650c14681317e0f1c6b892c318fcfaea5727f Signed-off-by: Kitae Kim --- tizen/src/ecs/genmsg/ecs.pb-c.h | 2 +- tizen/src/ecs/genmsg/ecs_ids.pb-c.h | 2 +- tizen/src/eventcast/Makefile.objs | 7 +++++++ tizen/src/eventcast/encode_fb.c | 8 ++++++++ tizen/src/eventcast/genmsg/eventcast.pb-c.h | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tizen/src/eventcast/Makefile.objs diff --git a/tizen/src/ecs/genmsg/ecs.pb-c.h b/tizen/src/ecs/genmsg/ecs.pb-c.h index a809b64..2b97f86 100644 --- a/tizen/src/ecs/genmsg/ecs.pb-c.h +++ b/tizen/src/ecs/genmsg/ecs.pb-c.h @@ -3,7 +3,7 @@ #ifndef PROTOBUF_C_ecs_2eproto__INCLUDED #define PROTOBUF_C_ecs_2eproto__INCLUDED -#include +#include "../../../distrib/protobuf/protobuf-c.h" PROTOBUF_C_BEGIN_DECLS diff --git a/tizen/src/ecs/genmsg/ecs_ids.pb-c.h b/tizen/src/ecs/genmsg/ecs_ids.pb-c.h index 59c0dec..b855d79 100644 --- a/tizen/src/ecs/genmsg/ecs_ids.pb-c.h +++ b/tizen/src/ecs/genmsg/ecs_ids.pb-c.h @@ -3,7 +3,7 @@ #ifndef PROTOBUF_C_ecs_5fids_2eproto__INCLUDED #define PROTOBUF_C_ecs_5fids_2eproto__INCLUDED -#include +#include "../../../distrib/protobuf/protobuf-c.h" PROTOBUF_C_BEGIN_DECLS diff --git a/tizen/src/eventcast/Makefile.objs b/tizen/src/eventcast/Makefile.objs new file mode 100644 index 0000000..d6bc934 --- /dev/null +++ b/tizen/src/eventcast/Makefile.objs @@ -0,0 +1,7 @@ +obj-y += genmsg/eventcast.pb-c.o # protobuf-c.o +obj-y += common.o +obj-y += sensor.o +obj-y += touch.o +obj-y += encode_fb.o + +encode_fb.o-cflags := $(LIBPNG_CFLAGS) diff --git a/tizen/src/eventcast/encode_fb.c b/tizen/src/eventcast/encode_fb.c index c639136..414d1df 100644 --- a/tizen/src/eventcast/encode_fb.c +++ b/tizen/src/eventcast/encode_fb.c @@ -47,6 +47,14 @@ DECLARE_DEBUG_CHANNEL(app_tethering); +#if !defined(CONFIG_SDL) || (!defined(CONFIG_SHM) && defined(CONFIG_DARWIN)) +bool maru_extract_framebuffer(void *buffer) +{ + LOG_INFO("SDL or SHM module is not enabled"); + return false; +} +#endif + #ifdef CONFIG_WEBP /* * webp functions diff --git a/tizen/src/eventcast/genmsg/eventcast.pb-c.h b/tizen/src/eventcast/genmsg/eventcast.pb-c.h index 92f5504..6d78492 100644 --- a/tizen/src/eventcast/genmsg/eventcast.pb-c.h +++ b/tizen/src/eventcast/genmsg/eventcast.pb-c.h @@ -3,7 +3,7 @@ #ifndef PROTOBUF_C_eventcast_2eproto__INCLUDED #define PROTOBUF_C_eventcast_2eproto__INCLUDED -#include +#include "../../../distrib/protobuf/protobuf-c.h" PROTOBUF_C_BEGIN_DECLS -- 2.7.4