From 6926c429193f20a68d93d3140195c2ec4cc3a6de Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Fri, 1 Aug 2014 13:14:27 +0900 Subject: [PATCH] emulator: fix issue that skin is not started on MacOS Change-Id: Ib696c4afceab66338779d402bc1bb337bd6400a8 Signed-off-by: SeokYeon Hwang --- tizen/src/emulator.c | 4 ++-- vl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index 572499f5f7..73a2544a8f 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -79,7 +79,7 @@ void emulator_add_exit_notifier(Notifier *notify) qemu_add_exit_notifier(notify); } -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL) || defined(CONFIG_USE_SHM) static void construct_main_window(int skin_argc, char *skin_argv[], int qemu_argc, char *qemu_argv[]) { @@ -276,7 +276,7 @@ const char *prepare_maru(const gchar * const kernel_cmdline) return maru_kernel_cmdline; } -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL) || defined(CONFIG_USE_SHM) void start_skin(void) { LOG_INFO("Start skin\n"); diff --git a/vl.c b/vl.c index 3da782a66a..702ff1ba70 100644 --- a/vl.c +++ b/vl.c @@ -4581,7 +4581,7 @@ int main(int argc, char **argv, char **envp) break; #endif #if defined(CONFIG_MARU) -#if defined(CONFIG_SDL) +#if defined(CONFIG_SDL) || defined(CONFIG_USE_SHM) case DT_MARU: maru_display_init(ds); if (skin_disabled == 1) { -- 2.34.1