endif
##
-ifdef CONFIG_BUILD_YAGL
-
-# YaGL
-QEMU_CFLAGS += -I$(SRC_PATH)/hw/yagl_inc
-
-$(call set-vpath, $(SRC_PATH)/hw/yagl_apis/egl: \
- $(SRC_PATH)/hw/yagl_apis/gles: \
- $(SRC_PATH)/hw/yagl_backends/egl_offscreen: \
- $(SRC_PATH)/hw/yagl_backends/egl_onscreen: \
- $(SRC_PATH)/hw/yagl_drivers/egl_glx: \
- $(SRC_PATH)/hw/yagl_drivers/egl_wgl: \
- $(SRC_PATH)/hw/yagl_drivers/egl_agl: \
- $(SRC_PATH)/hw/yagl_drivers/gles_ogl: \
- $(SRC_PATH)/hw/yagl_drivers/gles_onscreen)
-
-obj-y += yagl_device.o
-obj-y += yagl_log.o
-obj-y += yagl_process.o
-obj-y += yagl_thread.o
-obj-y += yagl_server.o
-obj-y += yagl_ref.o
-obj-y += yagl_mem.o
-obj-y += yagl_event.o
-obj-y += yagl_handle_gen.o
-obj-y += yagl_dyn_lib.o
-obj-y += yagl_api.o
-obj-y += yagl_vector.o
-obj-y += yagl_avl.o
-obj-y += yagl_transport.o
-obj-y += yagl_egl_backend.o
-obj-y += yagl_eglb_display.o
-obj-y += yagl_eglb_context.o
-obj-y += yagl_eglb_surface.o
-obj-y += yagl_egl_driver.o
-obj-y += yagl_gles_driver.o
-obj-y += yagl_resource.o
-obj-y += yagl_resource_list.o
-obj-y += yagl_object_map.o
-obj-y += yagl_stats.o
-obj-y += yagl_compiled_transfer.o
-obj-y += yagl_egl_native_config.o
-obj-y += yagl_egl_surface_attribs.o
-# EGL api
-obj-y += yagl_egl_api.o
-obj-y += yagl_egl_api_ps.o
-obj-y += yagl_egl_api_ts.o
-obj-y += yagl_egl_calls.o
-obj-y += yagl_egl_display.o
-obj-y += yagl_egl_config.o
-obj-y += yagl_egl_surface.o
-obj-y += yagl_egl_context.o
-obj-y += yagl_egl_validate.o
-obj-y += yagl_host_egl_calls.o
-# GLES api
-obj-y += yagl_gles_api.o
-obj-y += yagl_gles_api_ps.o
-obj-y += yagl_gles_api_ts.o
-obj-y += yagl_gles_calls.o
-obj-y += yagl_host_gles_calls.o
-# EGL offscreen backend
-obj-y += yagl_egl_offscreen.o
-obj-y += yagl_egl_offscreen_ts.o
-obj-y += yagl_egl_offscreen_display.o
-obj-y += yagl_egl_offscreen_context.o
-obj-y += yagl_egl_offscreen_surface.o
-# EGL onscreen backend
-obj-y += yagl_egl_onscreen.o
-obj-y += yagl_egl_onscreen_ts.o
-obj-y += yagl_egl_onscreen_display.o
-obj-y += yagl_egl_onscreen_context.o
-obj-y += yagl_egl_onscreen_surface.o
-# EGL GLX driver
-ifdef CONFIG_LINUX
-obj-y += yagl_egl_glx.o
-endif
-# EGL WGL driver
-ifdef CONFIG_WIN32
-obj-y += yagl_egl_wgl.o
-endif
-# EGL AGL driver
-ifdef CONFIG_DARWIN
-QEMU_CFLAGS += -Wno-comment
-obj-y += yagl_egl_agl.o
-endif
-# GLES OpenGL driver
-obj-y += yagl_gles_ogl.o
-# GLES onscreen driver
-obj-y += yagl_gles_onscreen.o
-
-endif
-
-ifdef CONFIG_BUILD_VIGS
-
-# VIGS
-QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs_inc
-
-obj-y += vigs_log.o
-obj-y += vigs_device.o
-obj-y += vigs_comm.o
-obj-y += vigs_server.o
-obj-y += vigs_backend.o
-obj-y += vigs_surface.o
-obj-y += vigs_utils.o
-obj-y += vigs_vector.o
-obj-y += vigs_ref.o
-obj-y += vigs_gl_backend.o
-obj-y += vigs_sw_backend.o
-# GL GLX backend
-ifdef CONFIG_LINUX
-obj-y += vigs_gl_backend_glx.o
-endif
-# GL WGL backend
-ifdef CONFIG_WIN32
-obj-y += vigs_gl_backend_wgl.o
-endif
-# GL AGL backend
-ifdef CONFIG_DARWIN
-obj-y += vigs_gl_backend_agl.o
-endif
-
-endif
-
# This resolves all nested paths, so it must come last
include $(SRC_PATH)/Makefile.objs
devices-dirs-$(CONFIG_VIRTIO) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
+devices-dirs-$(CONFIG_BUILD_VIGS) += yagl/
+devices-dirs-$(CONFIG_BUILD_VIGS) += vigs/
devices-dirs-y += core/
common-obj-y += $(devices-dirs-y)
obj-y += $(devices-dirs-y)
--- /dev/null
+# VIGS
+QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc
+
+obj-y += vigs_log.o
+obj-y += vigs_device.o
+obj-y += vigs_comm.o
+obj-y += vigs_server.o
+obj-y += vigs_backend.o
+obj-y += vigs_surface.o
+obj-y += vigs_utils.o
+obj-y += vigs_vector.o
+obj-y += vigs_ref.o
+obj-y += vigs_gl_backend.o
+obj-y += vigs_sw_backend.o
+# GL GLX backend
+ifdef CONFIG_LINUX
+obj-y += vigs_gl_backend_glx.o
+endif
+# GL WGL backend
+ifdef CONFIG_WIN32
+obj-y += vigs_gl_backend_wgl.o
+endif
+# GL AGL backend
+ifdef CONFIG_DARWIN
+obj-y += vigs_gl_backend_agl.o
+endif
--- /dev/null
+QEMU_CFLAGS += -I$(SRC_PATH)/hw/yagl -I$(SRC_PATH)/hw/yagl/yagl_inc
+
+obj-y += yagl_device.o
+obj-y += yagl_log.o
+obj-y += yagl_process.o
+obj-y += yagl_thread.o
+obj-y += yagl_server.o
+obj-y += yagl_ref.o
+obj-y += yagl_mem.o
+obj-y += yagl_event.o
+obj-y += yagl_handle_gen.o
+obj-y += yagl_dyn_lib.o
+obj-y += yagl_api.o
+obj-y += yagl_vector.o
+obj-y += yagl_avl.o
+obj-y += yagl_transport.o
+obj-y += yagl_egl_backend.o
+obj-y += yagl_eglb_display.o
+obj-y += yagl_eglb_context.o
+obj-y += yagl_eglb_surface.o
+obj-y += yagl_egl_driver.o
+obj-y += yagl_gles_driver.o
+obj-y += yagl_resource.o
+obj-y += yagl_resource_list.o
+obj-y += yagl_object_map.o
+obj-y += yagl_stats.o
+obj-y += yagl_compiled_transfer.o
+obj-y += yagl_egl_native_config.o
+obj-y += yagl_egl_surface_attribs.o
+obj-y += yagl_apis/
+obj-y += yagl_backends/
+obj-y += yagl_drivers/
--- /dev/null
+obj-y += egl/
+obj-y += gles/
--- /dev/null
+# EGL api
+obj-y += yagl_egl_api.o
+obj-y += yagl_egl_api_ps.o
+obj-y += yagl_egl_api_ts.o
+obj-y += yagl_egl_calls.o
+obj-y += yagl_egl_display.o
+obj-y += yagl_egl_config.o
+obj-y += yagl_egl_surface.o
+obj-y += yagl_egl_context.o
+obj-y += yagl_egl_validate.o
+obj-y += yagl_host_egl_calls.o
--- /dev/null
+# GLES api
+obj-y += yagl_gles_api.o
+obj-y += yagl_gles_api_ps.o
+obj-y += yagl_gles_api_ts.o
+obj-y += yagl_gles_calls.o
+obj-y += yagl_host_gles_calls.o
--- /dev/null
+obj-y += egl_offscreen/
+obj-y += egl_onscreen/
--- /dev/null
+# EGL offscreen backend
+obj-y += yagl_egl_offscreen.o
+obj-y += yagl_egl_offscreen_ts.o
+obj-y += yagl_egl_offscreen_display.o
+obj-y += yagl_egl_offscreen_context.o
+obj-y += yagl_egl_offscreen_surface.o
--- /dev/null
+# EGL onscreen backend
+obj-y += yagl_egl_onscreen.o
+obj-y += yagl_egl_onscreen_ts.o
+obj-y += yagl_egl_onscreen_display.o
+obj-y += yagl_egl_onscreen_context.o
+obj-y += yagl_egl_onscreen_surface.o
+
--- /dev/null
+obj-$(CONFIG_LINUX) += egl_glx/
+obj-$(CONFIG_WIN32) += egl_wgl/
+obj-$(CONFIG_DARWIN) += egl_agl/
+obj-y += gles_ogl/
+obj-y += gles_onscreen/
+
--- /dev/null
+# EGL AGL driver
+QEMU_CFLAGS += -Wno-comment
+obj-y += yagl_egl_agl.o
--- /dev/null
+# EGL GLX driver
+obj-y += yagl_egl_glx.o
--- /dev/null
+# EGL WGL driver
+obj-y += yagl_egl_wgl.o
--- /dev/null
+# GLES OpenGL driver
+obj-y += yagl_gles_ogl.o
--- /dev/null
+# GLES onscreen driver
+obj-y += yagl_gles_onscreen.o
+
#if defined(__linux__)
#include <X11/Xlib.h>
#endif
-#include "vigs_device.h"
+#include "vigs/vigs_device.h"
extern int enable_yagl;
extern const char *yagl_backend;
extern int enable_vigs;