eventcast: fix build errors 56/28656/2
authorKitae Kim <kt920.kim@samsung.com>
Mon, 13 Oct 2014 12:50:14 +0000 (21:50 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Tue, 14 Oct 2014 05:37:23 +0000 (14:37 +0900)
- 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 <kt920.kim@samsung.com>
tizen/src/ecs/genmsg/ecs.pb-c.h
tizen/src/ecs/genmsg/ecs_ids.pb-c.h
tizen/src/eventcast/Makefile.objs [new file with mode: 0644]
tizen/src/eventcast/encode_fb.c
tizen/src/eventcast/genmsg/eventcast.pb-c.h

index a809b64..2b97f86 100644 (file)
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_ecs_2eproto__INCLUDED
 #define PROTOBUF_C_ecs_2eproto__INCLUDED
 
-#include <google/protobuf-c/protobuf-c.h>
+#include "../../../distrib/protobuf/protobuf-c.h"
 
 PROTOBUF_C_BEGIN_DECLS
 
index 59c0dec..b855d79 100644 (file)
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
 #define PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
 
-#include <google/protobuf-c/protobuf-c.h>
+#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 (file)
index 0000000..d6bc934
--- /dev/null
@@ -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)
index c639136..414d1df 100644 (file)
 
 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
index 92f5504..6d78492 100644 (file)
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_eventcast_2eproto__INCLUDED
 #define PROTOBUF_C_eventcast_2eproto__INCLUDED
 
-#include <google/protobuf-c/protobuf-c.h>
+#include "../../../distrib/protobuf/protobuf-c.h"
 
 PROTOBUF_C_BEGIN_DECLS