From c6e33fca0bac30880047ba75cce0f58e999b9fdb Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Wed, 25 Jul 2012 17:45:35 +0900 Subject: [PATCH] [Title] include "config-host.h" [Type] bugfix [Module] Emulator [Priority] major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- tizen/src/Makefile.tizen | 5 ++++- tizen/src/emul_state.c | 1 + tizen/src/emulator.c | 1 + tizen/src/hw/maru_vga.c | 5 ++++- tizen/src/maru_common.h | 1 + tizen/src/maru_display.c | 5 ++++- tizen/src/skin/maruskin_operation.c | 5 ++++- 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen index e66b6a4..27a4617 100755 --- 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 6387c5f..4896085 100644 --- 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 2777bd6..e2578d0 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -30,6 +30,7 @@ */ +#include "maru_common.h" #include #include #include "maru_common.h" diff --git a/tizen/src/hw/maru_vga.c b/tizen/src/hw/maru_vga.c index 0fcc042..555be0e 100644 --- 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 89d1905..17ceb29 100644 --- 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 #include #include diff --git a/tizen/src/maru_display.c b/tizen/src/maru_display.c index 928f0b7..99358cd 100644 --- 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 0175d8e..786db82 100644 --- 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 -- 2.7.4