display: fix compilation error when SDL and SHM are both disabled

Change-Id: Ie49c216469197a53383ef1f5403934c252122272
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs
index 92bb3df0123c84f234666b37e393109d0facf94a..967bf46e7b1ac89def6884513db0e2abdd2e696d 100644 (file)
--- a/hw/vigs/Makefile.objs
+++ b/hw/vigs/Makefile.objs
@@ -3,6 +3,7 @@ QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc
 
 obj-y += vigs_log.o
 obj-y += vigs_device.o
+libs_softmmu += $(GLX_LIBS)
 obj-y += vigs_comm.o
 obj-y += vigs_server.o
 obj-y += vigs_backend.o

diff --git a/include/ui/console.h b/include/ui/console.h
index 9d2c5d9100e17f563d0053272912790749afcbd8..a95944f4af4810e5d37862733d73e42dde6ae330 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -9,7 +9,7 @@
 #include "qapi-types.h"
 #include "qapi/error.h"
 
-#if defined(CONFIG_MARU) && !defined(CONFIG_USE_SHM)
+#if defined(CONFIG_MARU) && defined(CONFIG_SDL)
 #define SDL_THREAD
 #endif
 

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 961d70240f3098099599756c35a3744f7cba5f68..f0a4cd57a6963b474a0a60972ffb4bab0829b9d6 100644 (file)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -53,12 +53,13 @@ ifdef CONFIG_DARWIN
 endif
 
 skin_client:
-#      TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -buildfile skin/client/build.xml make-jar
 ifdef CONFIG_USE_SHM
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=false -buildfile skin/client/build.xml make-jar
 else
+ifdef CONFIG_SDL
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=true -buildfile skin/client/build.xml make-jar
 endif
+endif
 
 build_info:
        @echo "Generate a build information file"
@@ -113,10 +114,15 @@ else
 endif
 
 # resources and jar for skin
+ifdef CONFIG_SDL
        cp -pP skin/client/emulator-skin.jar $(EMUL_DIR)/bin
        cp -pPR skin/client/skins $(EMUL_DIR)
-ifndef CONFIG_USE_SHM
        cp -pP skin/client/resource/images/blank-guide.png $(EMUL_DIR)/images
+else
+ifdef CONFIG_USE_SHM
+       cp -pP skin/client/emulator-skin.jar $(EMUL_DIR)/bin
+       cp -pPR skin/client/skins $(EMUL_DIR)
+endif
 endif
 
 # check capabilities of OpenGL and Webcam
@@ -187,12 +193,13 @@ endif
 # for dibs system...
 all_dibs: qemu skin_client_dibs
 skin_client_dibs:
-#      ant -buildfile skin/client/build.xml -Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin make-jar-dibs
 ifdef CONFIG_USE_SHM
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 else
+ifdef CONFIG_SDL
        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotNotUseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 endif
+endif
 
 
 install_dibs: all_dibs
@@ -231,10 +238,13 @@ else
 endif
 
 # resources and jar for skin
+ifdef CONFIG_SDL
        cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin
-       #cp -pPR skin/client/skins $(DIBS_COMMON_DIR)
-ifndef CONFIG_USE_SHM
        cp -pP skin/client/resource/images/blank-guide.png $(DIBS_COMMON_DIR)/images
+else
+ifdef CONFIG_USE_SHM
+       cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin
+endif
 endif
 
 # check capabilities of OpenGL and Webcam

diff --git a/tizen/src/display/Makefile.objs b/tizen/src/display/Makefile.objs
index 22e749900441a726b78563e464c6330a150cfaea..3660db9ee4630b6b6906dc739d5f416f561bfe27 100644 (file)
--- a/tizen/src/display/Makefile.objs
+++ b/tizen/src/display/Makefile.objs
@@ -2,7 +2,9 @@ obj-y += maru_display.o
 ifdef CONFIG_USE_SHM
 obj-y += maru_shm.o
 else
+ifdef CONFIG_SDL
 obj-y += maru_sdl.o maru_sdl_processing.o maru_finger.o
 endif
+endif
 
 $(obj)/maru_display.o $(obj)/maru_sdl.o $(obj)/maru_sdl_processing.o $(obj)/maru_finger.o: QEMU_CFLAGS += $(SDL_CFLAGS)

diff --git a/tizen/src/display/maru_display.c b/tizen/src/display/maru_display.c
index 6276067d8e242f895b1e7d42dd4764a30a3ba412..23dff8f4b6daf41c49791f23bad714bd8eebd3f3 100644 (file)
--- a/tizen/src/display/maru_display.c
+++ b/tizen/src/display/maru_display.c
@@ -34,7 +34,9 @@
 #include "debug_ch.h"
 
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
 #include "maru_sdl.h"
+#endif
 #else
 #include "maru_shm.h"
 #endif
@@ -50,7 +52,9 @@ static void maru_display_fini(void)
     g_free(screenshot);
 
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_quit();
+#endif
 #else
     maru_shm_quit();
 #endif
@@ -67,7 +71,9 @@ void maru_display_init(DisplayState *ds)
     INFO("init qemu display\n");
 
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_pre_init();
+#endif
 #else
     /* do nothing */
 #endif
@@ -76,7 +82,10 @@ void maru_display_init(DisplayState *ds)
     DisplayChangeListener *dcl;
 
     dcl = g_malloc0(sizeof(DisplayChangeListener));
+#if defined(CONFIG_USE_SHM) || defined(CONFIG_SDL)
+    //FIXME
     dcl->ops = &maru_dcl_ops;
+#endif
     register_displaychangelistener(dcl);
 
     screenshot = g_malloc0(sizeof(MaruScreenShot));
@@ -90,7 +99,9 @@ void maru_display_init(DisplayState *ds)
 void maru_display_resize(void)
 {
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_resize();
+#endif
 #else
     maru_shm_resize();
 #endif
@@ -99,7 +110,9 @@ void maru_display_resize(void)
 void maru_display_update(void)
 {
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_update();
+#endif
 #else
     /* do nothing */
 #endif
@@ -108,7 +121,9 @@ void maru_display_update(void)
 void maru_display_invalidate(bool on)
 {
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_invalidate(on);
+#endif
 #else
     /* do nothing */
 #endif
@@ -117,7 +132,9 @@ void maru_display_invalidate(bool on)
 void maru_display_interpolation(bool on)
 {
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_interpolation(on);
+#endif
 #else
     /* do nothing */
 #endif
@@ -128,8 +145,10 @@ void maru_ds_surface_init(uint64 swt_handle,
     bool blank_guide)
 {
 #ifndef CONFIG_USE_SHM
+#ifdef CONFIG_SDL
     maru_sdl_init(swt_handle,
         display_width, display_height, blank_guide);
+#endif
 #else
     maru_shm_init(swt_handle,
         display_width, display_height, blank_guide);

diff --git a/tizen/src/display/maru_finger.h b/tizen/src/display/maru_finger.h
index 61a32e854b60b1cb492b706c7a2bbdec44d7bb48..d5f071e3263b788861f435792000161eba889d7a 100644 (file)
--- a/tizen/src/display/maru_finger.h
+++ b/tizen/src/display/maru_finger.h
@@ -31,8 +31,8 @@
 #ifndef __MARU_FINGER_H__
 #define __MARU_FINGER_H__
 
-#include "qemu-common.h"
-
+#include <stdint.h>
+#include <stdbool.h>
 
 /* definitions relating to multi-touch */
 #define MAX_FINGER_CNT 10

diff --git a/tizen/src/display/maru_sdl.c b/tizen/src/display/maru_sdl.c
index 1c92fe7412ee144902ecf4d2acd9c28dc0224c18..cdc099de5451b4b891ac7e51f6031d1eb7d6e166 100644 (file)
--- a/tizen/src/display/maru_sdl.c
+++ b/tizen/src/display/maru_sdl.c
@@ -39,6 +39,7 @@
 #include "hw/pci/maru_brightness.h"
 #include "debug_ch.h"
 
+#include <SDL.h>
 #ifndef CONFIG_WIN32
 #include <SDL_syswm.h>
 #endif

diff --git a/tizen/src/display/maru_sdl.h b/tizen/src/display/maru_sdl.h
index 7b30156b607ff87e32c284cd1703ef0a40e3bd77..87e4ec877d94486f202a3677e0db489e819e61fa 100644 (file)
--- a/tizen/src/display/maru_sdl.h
+++ b/tizen/src/display/maru_sdl.h
@@ -32,7 +32,6 @@
 #ifndef MARU_SDL_H_
 #define MARU_SDL_H_
 
-#include <SDL.h>
 #include "ui/console.h"
 
 extern DisplayChangeListenerOps maru_dcl_ops;

diff --git a/tizen/src/ecs/ecs_msg.c b/tizen/src/ecs/ecs_msg.c
index 48f2f7f94f367c3b88530542b7dab496f2ad73a5..0ac65386152c9eb4f68b64778e98c5f9f82cd2b8 100644 (file)
--- a/tizen/src/ecs/ecs_msg.c
+++ b/tizen/src/ecs/ecs_msg.c
@@ -523,7 +523,7 @@ bool msgproc_device_req(ECS_Client* ccli, ECS__DeviceReq* msg)
         }
     } else if (!strncmp(cmd, "TGesture", strlen("TGesture"))) {
         /* release multi-touch */
-#ifndef CONFIG_USE_SHM
+#if !defined(CONFIG_USE_SHM) && defined(CONFIG_SDL)
         if (get_multi_touch_enable() != 0) {
             clear_finger_slot(false);
         }

diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h
index 0cadfcd9addb1f46835dc7348aa67d5697bba745..464becd5cbcc2fe31626b17916ad406d7f046628 100644 (file)
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -107,9 +107,9 @@ typedef struct EmulatorConfigState {
 } EmulatorConfigState;
 
 /* misc */
-extern gchar bin_path[];
+extern char bin_path[];
 #ifdef SUPPORT_LEGACY_ARGS
-extern gchar log_path[];
+extern char log_path[];
 #endif
 
 char const *get_bin_path(void);

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 60b1a5b5e1b98537bdb707d04340e6ee63c965c8..572499f5f7da7169459c3b4ade175430b86b0c4c 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -79,6 +79,7 @@ void emulator_add_exit_notifier(Notifier *notify)
     qemu_add_exit_notifier(notify);
 }
 
+#ifdef CONFIG_SDL
 static void construct_main_window(int skin_argc, char *skin_argv[],
                                 int qemu_argc, char *qemu_argv[])
 {
@@ -97,6 +98,7 @@ static void construct_main_window(int skin_argc, char *skin_argv[],
         }
     }
 }
+#endif
 
 static void get_host_proxy(char *http_proxy, char *https_proxy, char *ftp_proxy, char *socks_proxy)
 {
@@ -274,12 +276,14 @@ const char *prepare_maru(const gchar * const kernel_cmdline)
     return maru_kernel_cmdline;
 }
 
+#ifdef CONFIG_SDL
 void start_skin(void)
 {
     LOG_INFO("Start skin\n");
 
     construct_main_window(_skin_argc, _skin_argv, _qemu_argc, _qemu_argv);
 }
+#endif
 
 int qemu_main(int argc, char **argv, char **envp);
 int legacy_emulator_main(int argc, char **argv, char **envp);
@@ -448,4 +452,3 @@ int main(int argc, char *argv[])
     return emulator_main(argc, argv, NULL);
 }
 #endif
-

diff --git a/tizen/src/emulator_common.h b/tizen/src/emulator_common.h
index 64d221baebc2c490bbffccaae01b9c9862da16d6..99821be7cb5f6a3ecbb3c6f62d4da5081351efb5 100644 (file)
--- a/tizen/src/emulator_common.h
+++ b/tizen/src/emulator_common.h
@@ -38,6 +38,7 @@
 #ifndef __EMULATOR_COMMON_H__
 #define __EMULATOR_COMMON_H__
 
+#include <string.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 7be25972042a2c045dccbde1999a2b1793a2a68d..2a1aa64550aed267208d9e0774f2c61a088b4eae 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -120,7 +120,7 @@ void do_mouse_event(int button_type, int event_type,
         "host=(%d, %d), x=%d, y=%d, z=%d\n",
         button_type, event_type, origin_x, origin_y, x, y, z);
 
-#ifndef CONFIG_USE_SHM
+#if !defined(CONFIG_USE_SHM) && defined(CONFIG_SDL)
     /* multi-touch */
     if (get_emul_multi_touch_state()->multitouch_enable == 1) {
         maru_finger_processing_1(event_type, origin_x, origin_y, x, y);
@@ -193,7 +193,7 @@ void do_keyboard_key_event(int event_type,
         "state_mask=%d, key_location=%d\n",
         event_type, keycode, state_mask, key_location);
 
-#ifndef CONFIG_USE_SHM
+#if !defined(CONFIG_USE_SHM) && defined(CONFIG_SDL)
     if (get_emul_max_touch_point() > 1) {
         /* multi-touch checking */
         int state_mask_temp = state_mask & ~JAVA_KEYCODE_NO_FOCUS;

diff --git a/tizen/src/skin/maruskin_operation.h b/tizen/src/skin/maruskin_operation.h
index 317bfa0025486a1a1b4e547e00557e8f4238e7e8..b434f6c324130d5175dfed174af07a6606e5a44c 100644 (file)
--- a/tizen/src/skin/maruskin_operation.h
+++ b/tizen/src/skin/maruskin_operation.h
@@ -30,8 +30,7 @@
 #ifndef MARUSKIN_OPERATION_H_
 #define MARUSKIN_OPERATION_H_
 
-#include "qemu-common.h"
-
+#include "stdint.h"
 
 extern int ret_hax_init;
 
@@ -45,7 +44,7 @@ typedef struct DetailInfo {
     int data_length;
 } DetailInfo;
 
-void start_display(uint64 handle_id,
+void start_display(uint64_t handle_id,
     unsigned int display_width, unsigned int display_height,
     double scale_factor, short rotation_type, bool blank_guide);
 

diff --git a/tizen/src/tethering/common.h b/tizen/src/tethering/common.h
index c9c2892f6a565ed1e1146d16ae716a15426412c6..3a882c8c5a79b3b5223be7ea33db82111080f9b0 100644 (file)
--- a/tizen/src/tethering/common.h
+++ b/tizen/src/tethering/common.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include "qemu/queue.h"
+
 typedef struct input_device_list {
     int type;
     void *opaque;

diff --git a/tizen/src/tethering/encode_fb.c b/tizen/src/tethering/encode_fb.c
index a8f46032f3d95b30fe65f83f4d09dee9557ce18f..7c724b054387ee0fb019c0b3d524a8d70c633b6c 100644 (file)
--- a/tizen/src/tethering/encode_fb.c
+++ b/tizen/src/tethering/encode_fb.c
@@ -33,6 +33,7 @@
 #include <webp/encode.h>
 #endif
 
+#include "emulator_common.h"
 #include "emul_state.h"
 #include "skin/maruskin_operation.h"
 #include "encode_fb.h"

diff --git a/tizen/src/tethering/sensor.c b/tizen/src/tethering/sensor.c
index 43f7a0ac597f497c1a55bf7fd7a4360d38f7ad38..5516575808792b121d3a78949faf398f37f9cb71 100644 (file)
--- a/tizen/src/tethering/sensor.c
+++ b/tizen/src/tethering/sensor.c
@@ -35,12 +35,12 @@
 #define EISCONN WSAEISCONN
 #endif
 
-#include "qemu-common.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"
 #include "ui/console.h"
 #endif
 
+#include "emulator_common.h"
 #include "emul_state.h"
 
 #include "sensor.h"

diff --git a/tizen/src/tethering/touch.c b/tizen/src/tethering/touch.c
index 296b656cfe3425baaa237f3430252445727ffea1..391a670c30cd746fdddd4feb3e2c583a858b19a0 100644 (file)
--- a/tizen/src/tethering/touch.c
+++ b/tizen/src/tethering/touch.c
@@ -28,6 +28,7 @@
  *
  */
 
+#include "emulator_common.h"
 #include "emul_state.h"
 #include "common.h"
 #include "touch.h"

diff --git a/vl.c b/vl.c
index 5c83ae3c7e1a104a4e86ca81621851da7bfd2248..3da782a66a97871836db45be71f685be7cc7ee1e 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4540,6 +4540,32 @@ int main(int argc, char **argv, char **envp)
     if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, 1) != 0)
         exit(1);
 
+#ifdef CONFIG_VIGS
+    // To support legacy VIGS options
+    if (enable_vigs) {
+        PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
+        PCIDevice *pci_dev = pci_create(pci_bus, -1, "vigs");
+        if (vigs_backend) {
+            qdev_prop_set_string(&pci_dev->qdev, "backend", vigs_backend);
+        } else {
+            qdev_prop_set_string(&pci_dev->qdev, "backend", "gl");
+        }
+        qdev_prop_set_string(&pci_dev->qdev, "wsi", "wsi0");
+        qdev_init_nofail(&pci_dev->qdev);
+    }
+#endif
+#ifdef CONFIG_YAGL
+    // To support legacy YaGL options
+    if (enable_yagl) {
+        PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
+        PCIDevice *pci_dev = pci_create(pci_bus, -1, "yagl");
+        if (enable_vigs) {
+            qdev_prop_set_string(&pci_dev->qdev, "wsi", "wsi0");
+        }
+        qdev_init_nofail(&pci_dev->qdev);
+    }
+#endif
+
     net_check_clients();
 
     ds = init_displaystate();
@@ -4555,6 +4581,7 @@ int main(int argc, char **argv, char **envp)
         break;
 #endif
 #if defined(CONFIG_MARU)
+#if defined(CONFIG_SDL)
     case DT_MARU:
         maru_display_init(ds);
         if (skin_disabled == 1) {
@@ -4566,6 +4593,7 @@ int main(int argc, char **argv, char **envp)
         start_skin();
         break;
 #endif
+#endif
 #if defined(CONFIG_SDL)
     case DT_SDL:
         sdl_display_init(ds, full_screen, no_frame);
@@ -4610,31 +4638,6 @@ int main(int argc, char **argv, char **envp)
         qemu_spice_display_init();
     }
 #endif
-#ifdef CONFIG_VIGS
-    // To support legacy VIGS options
-    if (enable_vigs) {
-        PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
-        PCIDevice *pci_dev = pci_create(pci_bus, -1, "vigs");
-        if (vigs_backend) {
-            qdev_prop_set_string(&pci_dev->qdev, "backend", vigs_backend);
-        } else {
-            qdev_prop_set_string(&pci_dev->qdev, "backend", "gl");
-        }
-        qdev_prop_set_string(&pci_dev->qdev, "wsi", "wsi0");
-        qdev_init_nofail(&pci_dev->qdev);
-    }
-#endif
-#ifdef CONFIG_YAGL
-    // To support legacy YaGL options
-    if (enable_yagl) {
-        PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
-        PCIDevice *pci_dev = pci_create(pci_bus, -1, "yagl");
-        if (enable_vigs) {
-            qdev_prop_set_string(&pci_dev->qdev, "wsi", "wsi0");
-        }
-        qdev_init_nofail(&pci_dev->qdev);
-    }
-#endif
 
     if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
         exit(1);