[Title] include "config-host.h"

[Type] bugfix
[Module] Emulator
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index e66b6a4155a330b81879db3854ff3ceafc794438..27a461760a025fe91ce2eacd7d636230497f76ed 100755 (executable)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -62,7 +62,10 @@ endif #!CONFIG_DARWIN
 obj-y += emulator.o emul_state.o option.o maru_err_table.o
 
 # maru display
-obj-y += maru_display.o maru_shm.o maru_sdl.o sdl_rotate.o maru_finger.o
+obj-y += maru_display.o maru_shm.o
+ifndef CONFIG_DARWIN
+obj-y += maru_sdl.o sdl_rotate.o maru_finger.o
+endif
 
 # sdb
 obj-y += sdb.o

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index 6387c5f6c1f93e2d97d2025537414738e0557d2e..4896085837dd7baa3da737c617e54dc189e5d81c 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -30,6 +30,7 @@
  */
 
 
+#include "maru_common.h"
 #include "emul_state.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 2777bd6889e7fd9dc491ddd1a8a5abbc60d6d1c4..e2578d06ad9586d206d36327560787a05b14a73c 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -30,6 +30,7 @@
  */
 
 
+#include "maru_common.h"
 #include <stdlib.h>
 #include <SDL.h>
 #include "maru_common.h"

diff --git a/tizen/src/hw/maru_vga.c b/tizen/src/hw/maru_vga.c
index 0fcc042e02d94b95c7d8e825799802f90756fcc1..555be0ee22e10684b5ce886fbcffa9208b0ab5c2 100644 (file)
--- a/tizen/src/hw/maru_vga.c
+++ b/tizen/src/hw/maru_vga.c
@@ -29,8 +29,11 @@
  */
 
 
+#include "maru_common.h"
+
 #ifdef CONFIG_DARWIN
-#define USE_SHM //shared memory
+//shared memory
+#define USE_SHM
 #endif
 
 #include "hw.h"

diff --git a/tizen/src/maru_common.h b/tizen/src/maru_common.h
index 89d19058e213985e5c9332b5ae635eca5a9a2cfc..17ceb29f85f3ba6a539833cb07dfdd26e970d4da 100644 (file)
--- a/tizen/src/maru_common.h
+++ b/tizen/src/maru_common.h
@@ -37,6 +37,7 @@
 #ifndef __MARU_COMMON_H__
 #define __MARU_COMMON_H__
 
+#include "config-host.h"
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>

diff --git a/tizen/src/maru_display.c b/tizen/src/maru_display.c
index 928f0b7546d72515904d79cce4309a820894d2e7..99358cd9c9f1bdb602742c1a95ebc0042d1851a1 100644 (file)
--- a/tizen/src/maru_display.c
+++ b/tizen/src/maru_display.c
@@ -28,8 +28,11 @@
  */
 
 
+#include "maru_common.h"
+
 #ifdef CONFIG_DARWIN
-#define USE_SHM //shared memory
+//shared memory
+#define USE_SHM
 #endif
 
 #include "maru_display.h"

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 0175d8e0cfe8e7a2b2034d6914d74fa1cd83e4f4..786db8277261188bdde72be45117a27977f61f84 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -28,8 +28,11 @@
  */
 
 
+#include "maru_common.h"
+
 #ifdef CONFIG_DARWIN
-#define USE_SHM //shared memory
+//shared memory
+#define USE_SHM
 #endif
 
 #include <unistd.h>