From: Mateusz Majewski Date: Wed, 5 Feb 2025 06:22:29 +0000 (+0100) Subject: Use YaGL and VIGS headers explicitly X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f07f964d1517be5e30d92b2eb31af22741a689b;p=sdk%2Femulator%2Fqemu.git Use YaGL and VIGS headers explicitly Those headers are named the same as the standard headers of various graphical libraries, but are not compatible with them. In order to build QEMU against those libraries, we need to make sure we won't include those headers accidentally. Change-Id: Id50cc1c4617bbb36c17f7613cf2cdb94dad4659d --- diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs index 3ebd185f35..b5e65f2ac8 100644 --- a/hw/vigs/Makefile.objs +++ b/hw/vigs/Makefile.objs @@ -32,10 +32,8 @@ 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 obj-y += vigs_gl_backend_cgl.o -$(obj)/%.o: QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc endif diff --git a/hw/vigs/vigs_gl_backend.h b/hw/vigs/vigs_gl_backend.h index 9a2b4b38b4..58f4bef8c6 100644 --- a/hw/vigs/vigs_gl_backend.h +++ b/hw/vigs/vigs_gl_backend.h @@ -33,8 +33,8 @@ #include "vigs_types.h" #include "vigs_backend.h" #include "vigs_vector.h" -#include -#include +#include "vigs_inc/GL/gl.h" +#include "vigs_inc/GL/glext.h" #include "winsys_gl.h" #define TEXTURE_NUM 5 diff --git a/hw/vigs/vigs_gl_backend_glx.c b/hw/vigs/vigs_gl_backend_glx.c index 98e07f7646..6a2e847165 100644 --- a/hw/vigs/vigs_gl_backend_glx.c +++ b/hw/vigs/vigs_gl_backend_glx.c @@ -30,7 +30,7 @@ #include "vigs_gl_backend.h" #include "vigs_log.h" #include "vigs_qt5.h" -#include +#include "vigs_inc/GL/glx.h" #include #ifndef GLX_VERSION_1_4 diff --git a/hw/vigs/vigs_gl_backend_wgl.c b/hw/vigs/vigs_gl_backend_wgl.c index cf25a8f854..f8ed80c4c5 100644 --- a/hw/vigs/vigs_gl_backend_wgl.c +++ b/hw/vigs/vigs_gl_backend_wgl.c @@ -32,8 +32,8 @@ #include "vigs_qt5.h" #include #include -#include -#include +#include "vigs_inc/GL/gl.h" +#include "vigs_inc/GL/wglext.h" __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; diff --git a/hw/vigs/vigs_gl_pool.h b/hw/vigs/vigs_gl_pool.h index fa00ccfbd8..50f57e3cf3 100644 --- a/hw/vigs/vigs_gl_pool.h +++ b/hw/vigs/vigs_gl_pool.h @@ -32,8 +32,8 @@ #include "vigs_types.h" #include -#include -#include +#include "vigs_inc/GL/gl.h" +#include "vigs_inc/GL/glext.h" typedef GLuint (*vigs_gl_pool_alloc_func)(void */*user_data*/, uint32_t /*width*/, diff --git a/hw/vigs/vigs_inc/GL/gl.h b/hw/vigs/vigs_inc/GL/gl.h index 43eefe37dc..e7fd5e270c 100644 --- a/hw/vigs/vigs_inc/GL/gl.h +++ b/hw/vigs/vigs_inc/GL/gl.h @@ -2082,7 +2082,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh #else /* GL_GLEXT_LEGACY */ -#include +#include "vigs_inc/GL/glext.h" #endif /* GL_GLEXT_LEGACY */ diff --git a/hw/vigs/vigs_inc/GL/glu.h b/hw/vigs/vigs_inc/GL/glu.h index ba2228d8d8..50f9bb7eb4 100644 --- a/hw/vigs/vigs_inc/GL/glu.h +++ b/hw/vigs/vigs_inc/GL/glu.h @@ -35,7 +35,7 @@ #include "glu_mangle.h" #endif -#include +#include "vigs_inc/GL/gl.h" #ifndef GLAPIENTRY #if defined(_MSC_VER) || defined(__MINGW32__) diff --git a/hw/vigs/vigs_inc/GL/glx.h b/hw/vigs/vigs_inc/GL/glx.h index a3a7d97c93..31c9170b0a 100644 --- a/hw/vigs/vigs_inc/GL/glx.h +++ b/hw/vigs/vigs_inc/GL/glx.h @@ -28,7 +28,7 @@ #ifdef __VMS -#include +#include "vigs_inc/GL/vms_x_fix.h" # ifdef __cplusplus /* VMS Xlib.h gives problems with C++. * this avoids a bunch of trivial warnings */ @@ -42,7 +42,7 @@ #pragma message enable nosimpint #endif #endif -#include +#include "vigs_inc/GL/gl.h" #if defined(USE_MGL_NAMESPACE) @@ -343,7 +343,7 @@ typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName); #ifndef GLX_GLXEXT_LEGACY -#include +#include "vigs_inc/GL/glxext.h" #endif /* GLX_GLXEXT_LEGACY */ diff --git a/hw/vigs/vigs_inc/GL/osmesa.h b/hw/vigs/vigs_inc/GL/osmesa.h index 304655e7c4..dbc42e3651 100644 --- a/hw/vigs/vigs_inc/GL/osmesa.h +++ b/hw/vigs/vigs_inc/GL/osmesa.h @@ -57,7 +57,7 @@ extern "C" { #endif -#include +#include "vigs_inc/GL/gl.h" #define OSMESA_MAJOR_VERSION 6 diff --git a/hw/vigs/vigs_inc/GL/wmesa.h b/hw/vigs/vigs_inc/GL/wmesa.h index f5f4f273ba..ef80c3ac40 100644 --- a/hw/vigs/vigs_inc/GL/wmesa.h +++ b/hw/vigs/vigs_inc/GL/wmesa.h @@ -50,7 +50,7 @@ extern "C" { #endif -#include "GL/gl.h" +#include "vigs_inc/GL/gl.h" #if defined(_MSV_VER) && !defined(__GNUC__) # pragma warning (disable:4273) diff --git a/hw/yagl/Makefile.objs b/hw/yagl/Makefile.objs index 7f017bd5bf..aabd12a902 100644 --- a/hw/yagl/Makefile.objs +++ b/hw/yagl/Makefile.objs @@ -29,4 +29,4 @@ obj-y += yagl_apis/ obj-y += yagl_backends/ obj-y += yagl_drivers/ -$(obj)/%.o: QEMU_CFLAGS += -I$(SRC_PATH)/hw/yagl -I$(SRC_PATH)/hw/yagl/yagl_inc +$(obj)/%.o: QEMU_CFLAGS += -I$(SRC_PATH)/hw/yagl diff --git a/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h index 3d95bda1ab..843df2bf9f 100644 --- a/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h +++ b/hw/yagl/yagl_apis/egl/yagl_egl_api_ts.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGL_API_TS_H #include "yagl_api.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_backend; struct yagl_egl_context; diff --git a/hw/yagl/yagl_apis/egl/yagl_egl_config.c b/hw/yagl/yagl_apis/egl/yagl_egl_config.c index 0a365a6ed7..3164dafcf5 100644 --- a/hw/yagl/yagl_apis/egl/yagl_egl_config.c +++ b/hw/yagl/yagl_apis/egl/yagl_egl_config.c @@ -34,7 +34,7 @@ #include "yagl_resource.h" #include "yagl_process.h" #include "yagl_thread.h" -#include +#include "yagl_inc/EGL/eglext.h" static void yagl_egl_config_destroy(struct yagl_thread_state *cur_ts, struct yagl_ref *ref) { diff --git a/hw/yagl/yagl_apis/egl/yagl_egl_display.h b/hw/yagl/yagl_apis/egl/yagl_egl_display.h index f60c9dfb99..22a384fa1a 100644 --- a/hw/yagl/yagl_apis/egl/yagl_egl_display.h +++ b/hw/yagl/yagl_apis/egl/yagl_egl_display.h @@ -33,7 +33,7 @@ #include "yagl_types.h" #include "yagl_resource_list.h" #include "qemu/queue.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_backend; struct yagl_egl_config; diff --git a/hw/yagl/yagl_apis/egl/yagl_egl_validate.h b/hw/yagl/yagl_apis/egl/yagl_egl_validate.h index 55dbdaa39c..b08139c231 100644 --- a/hw/yagl/yagl_apis/egl/yagl_egl_validate.h +++ b/hw/yagl/yagl_apis/egl/yagl_egl_validate.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGL_VALIDATE_H #include "yagl_types.h" -#include +#include "yagl_inc/EGL/egl.h" bool yagl_egl_is_attrib_list_empty(const EGLint *attrib_list); diff --git a/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c index a8fbb570ad..493917e0f7 100644 --- a/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c +++ b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c @@ -46,7 +46,7 @@ #include "yagl_thread.h" #include "yagl_process.h" #include "yagl_object_map.h" -#include +#include "yagl_inc/EGL/eglext.h" #define YAGL_EGL_VERSION_MAJOR 1 #define YAGL_EGL_VERSION_MINOR 4 diff --git a/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h index 6012dc3cc3..68c538360e 100644 --- a/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h +++ b/hw/yagl/yagl_apis/egl/yagl_host_egl_calls.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_HOST_EGL_CALLS_H #include "yagl_api.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_api_ps *yagl_host_egl_process_init(struct yagl_process_state *ps, struct yagl_api *api); diff --git a/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c index 2f2245fdbf..9ddcc397e7 100644 --- a/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c +++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ps.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_api_ps.h" #include "yagl_process.h" #include "yagl_thread.h" diff --git a/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c index 23b153b850..ff19d3c3d4 100644 --- a/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c +++ b/hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_api_ts.h" #include "yagl_gles_api_ps.h" #include "yagl_gles_api.h" diff --git a/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h index 7703abc5f6..66a9a1283a 100644 --- a/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h +++ b/hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_HOST_GLES_CALLS_H #include "yagl_api.h" -#include +#include "yagl_inc/GL/gl.h" struct yagl_api_ps *yagl_host_gles_process_init(struct yagl_process_state *ps, struct yagl_api *api); diff --git a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c index f554df0c12..094a2bfa97 100644 --- a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c +++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_offscreen.h" #include "yagl_egl_offscreen_display.h" #include "yagl_egl_offscreen_context.h" diff --git a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c index 889ebc6412..f8361d06e1 100644 --- a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c +++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_offscreen_context.h" #include "yagl_egl_offscreen_display.h" #include "yagl_egl_offscreen.h" diff --git a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c index 54908ea2d3..f57e231270 100644 --- a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c +++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_offscreen_display.h" #include "yagl_egl_offscreen_context.h" #include "yagl_egl_offscreen_surface.h" diff --git a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c index 85c20830a8..7b6ada00f5 100644 --- a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c +++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_surface.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_offscreen_surface.h" #include "yagl_egl_offscreen_display.h" #include "yagl_egl_offscreen_context.h" diff --git a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h index 28dc490675..18b8c5d838 100644 --- a/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h +++ b/hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_ts.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGL_OFFSCREEN_TS_H #include "yagl_types.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_gles_driver; struct yagl_egl_offscreen_display; diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c index 827603c6eb..7bdae7f35d 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c @@ -28,7 +28,7 @@ */ #include "yagl_egl_onscreen.h" -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_onscreen_ts.h" #include "yagl_egl_onscreen_display.h" #include "yagl_egl_onscreen_context.h" diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c index 8dd9523bc9..543ac51ebe 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_onscreen_context.h" #include "yagl_egl_onscreen_display.h" #include "yagl_egl_onscreen.h" diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h index a482f38446..2c838e203e 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h @@ -32,7 +32,7 @@ #include "yagl_eglb_context.h" #include "yagl_egl_native_config.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_onscreen_display; struct yagl_egl_onscreen_surface; diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c index 8d09635e1f..953a8836a2 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_display.c @@ -28,7 +28,7 @@ */ #include "yagl_egl_onscreen_display.h" -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_onscreen_context.h" #include "yagl_egl_onscreen_surface.h" #include "yagl_egl_onscreen.h" diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c index 63bfb2ec6d..1312ce56d0 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_onscreen_surface.h" #include "yagl_egl_onscreen_context.h" #include "yagl_egl_onscreen_display.h" diff --git a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c index 41fd02f584..11898073d8 100644 --- a/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c +++ b/hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_ts.c @@ -28,7 +28,7 @@ */ #include "yagl_egl_onscreen_ts.h" -#include +#include "yagl_inc/GL/gl.h" #include "yagl_egl_onscreen.h" #include "yagl_egl_onscreen_context.h" #include "yagl_egl_onscreen_surface.h" diff --git a/hw/yagl/yagl_device.c b/hw/yagl/yagl_device.c index 02fd612efb..2536624253 100644 --- a/hw/yagl/yagl_device.c +++ b/hw/yagl/yagl_device.c @@ -43,7 +43,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "qemu/error-report.h" -#include +#include "yagl_inc/GL/gl.h" #include "hw/vigs/display.h" #include "hw/vigs/winsys.h" #include "yagl_gles_driver.h" diff --git a/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c b/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c index a42b5f7427..43a6c4b6de 100644 --- a/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c +++ b/hw/yagl/yagl_drivers/egl_cgl/yagl_egl_cgl.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include #include "yagl_egl_driver.h" #include "yagl_dyn_lib.h" diff --git a/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c index f287faa50f..53f53703cd 100644 --- a/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c +++ b/hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c @@ -34,7 +34,7 @@ #include "yagl_process.h" #include "yagl_egl_native_config.h" #include "yagl_egl_surface_attribs.h" -#include +#include "yagl_inc/GL/glx.h" #define YAGL_EGL_GLX_ENTER(func, format, ...) \ YAGL_LOG_NO_TS; \ diff --git a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c index 496f05dc00..fc1a53b8f9 100644 --- a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c +++ b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c @@ -29,8 +29,8 @@ #include #include -#include -#include +#include "yagl_inc/GL/gl.h" +#include "yagl_inc/GL/wglext.h" #include #include "yagl_egl_driver.h" #include "yagl_dyn_lib.h" diff --git a/hw/yagl/yagl_drivers/gles_offscreen/yagl_gles_offscreen.c b/hw/yagl/yagl_drivers/gles_offscreen/yagl_gles_offscreen.c index 7f9f299461..0410238c50 100644 --- a/hw/yagl/yagl_drivers/gles_offscreen/yagl_gles_offscreen.c +++ b/hw/yagl/yagl_drivers/gles_offscreen/yagl_gles_offscreen.c @@ -28,7 +28,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_offscreen.h" #include "yagl_gles_driver.h" #include "yagl_log.h" diff --git a/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c index ec27456a46..d218ce2cd1 100644 --- a/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c +++ b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_driver.h" #include "yagl_gles_ogl.h" #include "yagl_gles_ogl_macros.h" diff --git a/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h index 8f76bbd0d4..5cbd4fd152 100644 --- a/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h +++ b/hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl_macros.h @@ -30,7 +30,7 @@ #ifndef _QEMU_YAGL_GLES_OGL_MACROS_H #define _QEMU_YAGL_GLES_OGL_MACROS_H -#include +#include "yagl_inc/GL/gl.h" /* * GLES OpenGL function loading/assigning macros. diff --git a/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c index 790f3e6ca1..46b9643551 100644 --- a/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c +++ b/hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_onscreen.h" #include "yagl_gles_driver.h" #include "yagl_log.h" diff --git a/hw/yagl/yagl_egl_driver.h b/hw/yagl/yagl_egl_driver.h index 5c886364e6..67590090dd 100644 --- a/hw/yagl/yagl_egl_driver.h +++ b/hw/yagl/yagl_egl_driver.h @@ -32,7 +32,7 @@ #include "yagl_types.h" #include "yagl_dyn_lib.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_native_config; struct yagl_egl_pbuffer_attribs; diff --git a/hw/yagl/yagl_egl_native_config.h b/hw/yagl/yagl_egl_native_config.h index 3dd356cbb5..7f28d03d20 100644 --- a/hw/yagl/yagl_egl_native_config.h +++ b/hw/yagl/yagl_egl_native_config.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGL_NATIVE_CONFIG_H #include "yagl_types.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_native_config { diff --git a/hw/yagl/yagl_egl_surface_attribs.h b/hw/yagl/yagl_egl_surface_attribs.h index 900e4a4aba..839e036043 100644 --- a/hw/yagl/yagl_egl_surface_attribs.h +++ b/hw/yagl/yagl_egl_surface_attribs.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGL_SURFACE_ATTRIBS_H #include "yagl_types.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_pbuffer_attribs { diff --git a/hw/yagl/yagl_eglb_display.h b/hw/yagl/yagl_eglb_display.h index 85270219a8..fac5223ae3 100644 --- a/hw/yagl/yagl_eglb_display.h +++ b/hw/yagl/yagl_eglb_display.h @@ -31,7 +31,7 @@ #define _QEMU_YAGL_EGLB_DISPLAY_H #include "yagl_types.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_egl_backend; struct yagl_eglb_context; diff --git a/hw/yagl/yagl_eglb_surface.h b/hw/yagl/yagl_eglb_surface.h index 0f393edd08..0eadb81696 100644 --- a/hw/yagl/yagl_eglb_surface.h +++ b/hw/yagl/yagl_eglb_surface.h @@ -32,7 +32,7 @@ #include "yagl_types.h" #include "yagl_egl_surface_attribs.h" -#include +#include "yagl_inc/EGL/egl.h" struct yagl_eglb_display; diff --git a/hw/yagl/yagl_gles_driver.c b/hw/yagl/yagl_gles_driver.c index 59ceef7e65..ea778af091 100644 --- a/hw/yagl/yagl_gles_driver.c +++ b/hw/yagl/yagl_gles_driver.c @@ -27,7 +27,7 @@ * */ -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_driver.h" #include "yagl_thread.h" #include "yagl_process.h" diff --git a/hw/yagl/yagl_inc/EGL/egl.h b/hw/yagl/yagl_inc/EGL/egl.h index 99ea342a47..3e799ee31d 100644 --- a/hw/yagl/yagl_inc/EGL/egl.h +++ b/hw/yagl/yagl_inc/EGL/egl.h @@ -33,7 +33,7 @@ /* All platform-dependent types and macro boilerplate (such as EGLAPI * and EGLAPIENTRY) should go in eglplatform.h. */ -#include +#include "yagl_inc/EGL/eglplatform.h" #ifdef __cplusplus extern "C" { diff --git a/hw/yagl/yagl_inc/EGL/eglext.h b/hw/yagl/yagl_inc/EGL/eglext.h index a392b31d9d..4c9f615071 100644 --- a/hw/yagl/yagl_inc/EGL/eglext.h +++ b/hw/yagl/yagl_inc/EGL/eglext.h @@ -36,7 +36,7 @@ extern "C" { ** Khronos $Revision: 23535 $ on $Date: 2013-10-16 10:29:40 -0700 (Wed, 16 Oct 2013) $ */ -#include +#include "yagl_inc/EGL/eglplatform.h" #define EGL_EGLEXT_VERSION 20131016 diff --git a/hw/yagl/yagl_inc/EGL/eglmesaext.h b/hw/yagl/yagl_inc/EGL/eglmesaext.h index 1f07d4cde5..9921271701 100644 --- a/hw/yagl/yagl_inc/EGL/eglmesaext.h +++ b/hw/yagl/yagl_inc/EGL/eglmesaext.h @@ -32,7 +32,7 @@ extern "C" { #endif -#include +#include "yagl_inc/EGL/eglplatform.h" /* EGL_MESA_screen extension >>> PRELIMINARY <<< */ #ifndef EGL_MESA_screen_surface diff --git a/hw/yagl/yagl_inc/GL/gl.h b/hw/yagl/yagl_inc/GL/gl.h index e65e1bc8a8..3d3ebd9292 100644 --- a/hw/yagl/yagl_inc/GL/gl.h +++ b/hw/yagl/yagl_inc/GL/gl.h @@ -2082,7 +2082,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh #else /* GL_GLEXT_LEGACY */ -#include +#include "yagl_inc/GL/glext.h" #endif /* GL_GLEXT_LEGACY */ diff --git a/hw/yagl/yagl_inc/GL/glu.h b/hw/yagl/yagl_inc/GL/glu.h index ba2228d8d8..3d68f5054e 100644 --- a/hw/yagl/yagl_inc/GL/glu.h +++ b/hw/yagl/yagl_inc/GL/glu.h @@ -35,7 +35,7 @@ #include "glu_mangle.h" #endif -#include +#include "yagl_inc/GL/gl.h" #ifndef GLAPIENTRY #if defined(_MSC_VER) || defined(__MINGW32__) diff --git a/hw/yagl/yagl_inc/GL/glx.h b/hw/yagl/yagl_inc/GL/glx.h index a3a7d97c93..2c97dc719e 100644 --- a/hw/yagl/yagl_inc/GL/glx.h +++ b/hw/yagl/yagl_inc/GL/glx.h @@ -28,7 +28,7 @@ #ifdef __VMS -#include +#include "yagl_inc/GL/vms_x_fix.h" # ifdef __cplusplus /* VMS Xlib.h gives problems with C++. * this avoids a bunch of trivial warnings */ @@ -42,7 +42,7 @@ #pragma message enable nosimpint #endif #endif -#include +#include "yagl_inc/GL/gl.h" #if defined(USE_MGL_NAMESPACE) @@ -343,7 +343,7 @@ typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName); #ifndef GLX_GLXEXT_LEGACY -#include +#include "yagl_inc/GL/glxext.h" #endif /* GLX_GLXEXT_LEGACY */ diff --git a/hw/yagl/yagl_inc/GL/osmesa.h b/hw/yagl/yagl_inc/GL/osmesa.h index 304655e7c4..f71494064b 100644 --- a/hw/yagl/yagl_inc/GL/osmesa.h +++ b/hw/yagl/yagl_inc/GL/osmesa.h @@ -57,7 +57,7 @@ extern "C" { #endif -#include +#include "yagl_inc/GL/gl.h" #define OSMESA_MAJOR_VERSION 6 diff --git a/hw/yagl/yagl_inc/GL/wmesa.h b/hw/yagl/yagl_inc/GL/wmesa.h index f5f4f273ba..a451dc539f 100644 --- a/hw/yagl/yagl_inc/GL/wmesa.h +++ b/hw/yagl/yagl_inc/GL/wmesa.h @@ -50,7 +50,7 @@ extern "C" { #endif -#include "GL/gl.h" +#include "yagl_inc/GL/gl.h" #if defined(_MSV_VER) && !defined(__GNUC__) # pragma warning (disable:4273) diff --git a/hw/yagl/yagl_server.c b/hw/yagl/yagl_server.c index b2f09a1a3a..eff18332ca 100644 --- a/hw/yagl/yagl_server.c +++ b/hw/yagl/yagl_server.c @@ -36,7 +36,7 @@ #include "yagl_egl_backend.h" #include "yagl_apis/egl/yagl_egl_api.h" #include "yagl_apis/gles/yagl_gles_api.h" -#include +#include "yagl_inc/GL/gl.h" #include "yagl_gles_driver.h" static __inline void yagl_marshal_put_uint32_t(uint8_t** buff, uint32_t value) diff --git a/hw/yagl/yagl_transport_egl.h b/hw/yagl/yagl_transport_egl.h index 38869df906..1afceb6512 100644 --- a/hw/yagl/yagl_transport_egl.h +++ b/hw/yagl/yagl_transport_egl.h @@ -32,7 +32,7 @@ #include "yagl_types.h" #include "yagl_transport.h" -#include +#include "yagl_inc/EGL/egl.h" static __inline EGLint yagl_transport_get_out_EGLint(struct yagl_transport *t) { diff --git a/tizen/src/util/Makefile.objs b/tizen/src/util/Makefile.objs index a322caf7d7..fc85c8eba0 100644 --- a/tizen/src/util/Makefile.objs +++ b/tizen/src/util/Makefile.objs @@ -1,11 +1,3 @@ -ifdef CONFIG_WIN32 -QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc -endif - -ifdef CONFIG_DARWIN -QEMU_CFLAGS += -I$(SRC_PATH)/hw/vigs/vigs_inc -endif - # ui operations obj-y += ui_operations.o