fix win32 build and mutex/condvar use before init

Change-Id: Ie0e07bca6c7e7254b52d437e8adfa65d9dd5d3a1
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>

diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs
index f4a364d63d52a0fffb4e1a55171e1c57d20ddfef..c3e265e6113ef7a0bb1df79a27dc843797297197 100644 (file)
--- a/hw/vigs/Makefile.objs
+++ b/hw/vigs/Makefile.objs
@@ -26,6 +26,7 @@ endif
 # GL WGL backend
 ifdef CONFIG_WIN32
 obj-y += vigs_gl_backend_wgl.o
+$(obj)/%.o: QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc
 endif
 # GL CGL backend
 ifdef CONFIG_DARWIN

diff --git a/tizen/src/display/maru_sdl.c b/tizen/src/display/maru_sdl.c
index 2c0cea3145ece9074caaff4a1557f9f4faccb0f7..66f916ca2f6067b83eb01436ee0cbf4fc057dc3a 100644 (file)
--- a/tizen/src/display/maru_sdl.c
+++ b/tizen/src/display/maru_sdl.c
@@ -604,7 +604,6 @@ static void maru_sdl_init(uint64 swt_handle,
 void maru_sdl_pre_init(MaruDisplayChangeListener *mdcl) {
     DisplayChangeListener *dcl = g_malloc0(sizeof(DisplayChangeListener));
     dcl->ops = &dcl_ops;
-    register_displaychangelistener(dcl);
 
     mdcl->surface_init = maru_sdl_init;
     mdcl->fini = maru_sdl_quit;
@@ -622,4 +621,5 @@ void maru_sdl_pre_init(MaruDisplayChangeListener *mdcl) {
     qemu_mutex_init(&sdl_mutex);
     qemu_cond_init(&sdl_cond);
 #endif
+    register_displaychangelistener(dcl);
 }

diff --git a/tizen/src/util/Makefile.objs b/tizen/src/util/Makefile.objs
index b3503eb7e239d9d5ad17bb8220f0b51afd0d26f0..53b404d4aebf59f11cedc913853ce9d39aa49aff 100644 (file)
--- a/tizen/src/util/Makefile.objs
+++ b/tizen/src/util/Makefile.objs
@@ -1,3 +1,7 @@
+ifdef CONFIG_WIN32
+QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc
+endif
+
 # osutil
 LIBS += $(CURL_LIBS)
 obj-y += osutil.o