the include thing

Change-Id: Id50cc1c4617bbb36c17f7613cf2cdb94dad4659d

diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs
index 3ebd185f3550e96119eb7c9bb0eb5c02a9e3dad7..b5e65f2ac81b6924ac77cba32bcc2e56775b7090 100644 (file)
--- 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 9a2b4b38b49a2f7d51b5c43fa3798b778038ca88..58f4bef8c60dcbc6f966e6a4f3deb6a7207f1efc 100644 (file)
--- 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 <GL/gl.h>
-#include <GL/glext.h>
+#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 98e07f764648f5ba72d9be60ff33553daae47cd6..6a2e8471657aebf88b2eac9d7c4b80aef061743c 100644 (file)
--- 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 <GL/glx.h>
+#include "vigs_inc/GL/glx.h"
 #include <dlfcn.h>
 
 #ifndef GLX_VERSION_1_4

diff --git a/hw/vigs/vigs_gl_backend_wgl.c b/hw/vigs/vigs_gl_backend_wgl.c
index cf25a8f8541cc91cf7e755f3dcad607f17a2698a..f8ed80c4c52c0fc66d022c6e4392ab7ff74621b0 100644 (file)
--- 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 <windows.h>
 #include <wingdi.h>
-#include <GL/gl.h>
-#include <GL/wglext.h>
+#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 fa00ccfbd80f0839ddbf3a3c93465a1a30e711f1..50f57e3cf3d9ba4b72bc20eb777d868286ccf613 100644 (file)
--- a/hw/vigs/vigs_gl_pool.h
+++ b/hw/vigs/vigs_gl_pool.h
@@ -32,8 +32,8 @@
 
 #include "vigs_types.h"
 #include <glib.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
+#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 43eefe37dcb27079d6f47028e0712cd925ddb0af..e7fd5e270cce20acf3f059caa8d6fbf950e2e71f 100644 (file)
--- 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 <GL/glext.h>
+#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 ba2228d8d86ab38f604c948bee2e73883972d979..50f9bb7eb45b2b1bf55d39b5e87e4107cf27dc28 100644 (file)
--- 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 <GL/gl.h>
+#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 a3a7d97c9328d824bac8d62cc39420311b005953..31c9170b0a2031c32091142de9b601598e160714 100644 (file)
--- a/hw/vigs/vigs_inc/GL/glx.h
+++ b/hw/vigs/vigs_inc/GL/glx.h
@@ -28,7 +28,7 @@
 
 
 #ifdef __VMS
-#include <GL/vms_x_fix.h>
+#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 <GL/gl.h>
+#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 <GL/glxext.h>
+#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 304655e7c449e0653ac2c4e1150e2e1b99ea8690..dbc42e3651d93120991b0c96f17697c942782bc5 100644 (file)
--- a/hw/vigs/vigs_inc/GL/osmesa.h
+++ b/hw/vigs/vigs_inc/GL/osmesa.h
@@ -57,7 +57,7 @@ extern "C" {
 #endif
 
 
-#include <GL/gl.h>
+#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 f5f4f273ba9483c42ec7942b414e8e095e619189..ef80c3ac408afd23cc63e3d7369d5731731a115c 100644 (file)
--- 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 7f017bd5bf80fe8016593d4d4521651fa8e291a8..aabd12a90247801f822fcb9daa3f5f577f8ca17a 100644 (file)
--- 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 3d95bda1abaf5d4769876f5bda43b7e14601093b..843df2bf9fd34646fab7a74dbac0380850d8e85e 100644 (file)
--- 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 <EGL/egl.h>
+#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 0a365a6ed733abc840abf2e5744ad56ccc5a88c4..3164dafcf5df767e064de97adb7ffd128676cba8 100644 (file)
--- 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 <EGL/eglext.h>
+#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 f60c9dfb9961fe42b214f410780559a5a7d92023..22a384fa1a16ed11f2dbded586915595818afaab 100644 (file)
--- 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 <EGL/egl.h>
+#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 55dbdaa39c9593ba6d73651ac8e9a7f94361deef..b08139c23181ae5ddad72ef2af5d6f7172a67b9c 100644 (file)
--- 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 <EGL/egl.h>
+#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 a8fbb570ad6c2b827658b6c51a2ef275384fdd32..493917e0f7fe0a120c7fbdfbdd7475abf5e5f9bd 100644 (file)
--- 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 <EGL/eglext.h>
+#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 6012dc3cc31947356f8172742a5c9d03dc97c391..68c538360e08f5aa7838182bb5ec09f94cf2e460 100644 (file)
--- 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 <EGL/egl.h>
+#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 2f2245fdbfec75e37fd4465334e907debcd65d6f..9ddcc397e7ff34f454b2cb72eeb06589bdfc3d24 100644 (file)
--- 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 <GL/gl.h>
+#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 23b153b850e096dcc76a0103d6cf7d289a6e82a5..ff19d3c3d46d015ea7f3f13ca948c9d8acfecc9f 100644 (file)
--- 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 <GL/gl.h>
+#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 7703abc5f695df48fd510772cae6e74179dc2fd8..66a9a1283a70060d691a6490ae8473c5e7dcf28b 100644 (file)
--- 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 <GL/gl.h>
+#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 f554df0c1268c191c6db0cc184058fdc57cf6f55..094a2bfa97885f86a3f300ec28b45d322e2c7d1b 100644 (file)
--- 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 <GL/gl.h>
+#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 889ebc641229515422d74812e29a0f858abd6a13..f8361d06e10c1391c82210cb30ef721a99d18cc9 100644 (file)
--- 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 <GL/gl.h>
+#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 54908ea2d363fe925b5746f151a0d63d4412d085..f57e231270eb4c9078d0821c356cba3452ebf952 100644 (file)
--- 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 <GL/gl.h>
+#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 85c20830a84842e1403679353eec773eeb28c2b9..7b6ada00f539f0b95a6a2f22a1129c1762b908db 100644 (file)
--- 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 <GL/gl.h>
+#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 28dc490675533070f810864f64eb0489bcf99e94..18b8c5d83880727ee0b99deacc32088bb2ca4c93 100644 (file)
--- 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 <EGL/egl.h>
+#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 827603c6eb01611a3d9b657f013952ba6f5712f2..7bdae7f35d05daa753caf276d52bade815cb11e2 100644 (file)
--- 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 <GL/gl.h>
+#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 8dd9523bc9a27fd85c023acea8ccbd2c98c5bcdc..543ac51ebe0c3eafe558498d22c43417e878276a 100644 (file)
--- 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 <GL/gl.h>
+#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 a482f384463bebc4f320c397f8d34fa3268cc9df..2c838e203e0d916d60d6c0c03df725a92d6ecca6 100644 (file)
--- 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 <EGL/egl.h>
+#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 8d09635e1f25bd7c076f47a0fe7915720fe84858..953a8836a277f7d8c8c98b0097287350b9a23650 100644 (file)
--- 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 <GL/gl.h>
+#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 63bfb2ec6d066502ae5a376328e87710434061fb..1312ce56d08180ead19a2267ab9862a8c3a66df6 100644 (file)
--- 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 <GL/gl.h>
+#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 41fd02f584c96e1889f62fa572eee8a621c243bb..11898073d88f0969b6e2f1f1c7ddc2c799ee3925 100644 (file)
--- 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 <GL/gl.h>
+#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 02fd612efb7ef98eb6ead02898317f3927718a0e..2536624253375798fa672246da9df8c967d4b21d 100644 (file)
--- 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 <GL/gl.h>
+#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 a42b5f7427471732f4779836811a43dcb08b4726..43a6c4b6de302ab22f87fbd2293d5b686bf489b2 100644 (file)
--- 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 <GL/gl.h>
+#include "yagl_inc/GL/gl.h"
 #include <OpenGL/OpenGL.h>
 #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 f287faa50f66910043f73a96331331fc259be10c..53f53703cd24c40cd6604d0250e237bcc3a7959d 100644 (file)
--- 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 <GL/glx.h>
+#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 496f05dc008122fb47c386a10b1cceb492072fb2..fc1a53b8f9f1a02e5b27ee50048b92e11d3607a1 100644 (file)
--- 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 <windows.h>
 #include <wingdi.h>
-#include <GL/gl.h>
-#include <GL/wglext.h>
+#include "yagl_inc/GL/gl.h"
+#include "yagl_inc/GL/wglext.h"
 #include <glib.h>
 #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 7f9f29946188f0f76e7f0da3312dbd32069fbb5a..0410238c5040fa7b4823880a9c02aaeb07d82292 100644 (file)
--- 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 <GL/gl.h>
+#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 ec27456a4664304ed075105ac1ea16f91b84bcf6..d218ce2cd16aa8fe3ed76f2f9d1c4443ad5ec6a7 100644 (file)
--- 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 <GL/gl.h>
+#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 8f76bbd0d42e2a3c27f4f13ad9fd013f35914561..5cbd4fd152168ecc23dfce48d6357888c9e7f1c5 100644 (file)
--- 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 <GL/gl.h>
+#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 790f3e6ca14cfc263eda29cd01347b84a7d6a8b0..46b9643551d111e90bf162b0945dafe0ea113e61 100644 (file)
--- 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 <GL/gl.h>
+#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 5c886364e67a6d33d761006639fd4aa2e19fcc86..67590090dd114098108d08bac37e16f1a85a9562 100644 (file)
--- 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 <EGL/egl.h>
+#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 3dd356cbb5bde4c0d04c9309d3466d4662d94e57..7f28d03d20f7d58112a57e325700c38339053589 100644 (file)
--- 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 <EGL/egl.h>
+#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 900e4a4abaf029711642684a77bf07950de23770..839e0360439c3b290ce68848f57c51973b0ecd4b 100644 (file)
--- 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 <EGL/egl.h>
+#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 85270219a8ce0f5b244f9763cdb986495df29a82..fac5223ae3f93c85f82e32cbb3580a4b3e2f0b96 100644 (file)
--- 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 <EGL/egl.h>
+#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 0f393edd08e50daf0bbe80372054d0dc6707731e..0eadb816965af88fc755314259b6cf047204d45c 100644 (file)
--- 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 <EGL/egl.h>
+#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 59ceef7e651af6bb8edd0b6b03f2e41217583bfc..ea778af091bc182d612937e335f887474ff48fa9 100644 (file)
--- a/hw/yagl/yagl_gles_driver.c
+++ b/hw/yagl/yagl_gles_driver.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include <GL/gl.h>
+#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 99ea342a47738e45bed10578a9671a7cbe6709c2..3e799ee31d0955daf592cb46224c29b756a7f292 100644 (file)
--- 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 <EGL/eglplatform.h>
+#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 a392b31d9d4870a9fe30865838b8806b3822e632..4c9f6150710d0c7c1aef5518ab808f3b10a9ff94 100644 (file)
--- 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 <EGL/eglplatform.h>
+#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 1f07d4cde5f421aaaaeb6da2a32268263af50e18..9921271701e93144f530704b049e0c63f4933885 100644 (file)
--- a/hw/yagl/yagl_inc/EGL/eglmesaext.h
+++ b/hw/yagl/yagl_inc/EGL/eglmesaext.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include <EGL/eglplatform.h>
+#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 e65e1bc8a8f4e99239442b5e99853cf9686115d3..3d3ebd9292ad7f831d8ef97eb0123bd7dbe2ec5d 100644 (file)
--- 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 <GL/glext.h>
+#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 ba2228d8d86ab38f604c948bee2e73883972d979..3d68f5054e6d99db1ff9973708e6af725f7d8a9f 100644 (file)
--- 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 <GL/gl.h>
+#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 a3a7d97c9328d824bac8d62cc39420311b005953..2c97dc719ebb5ceac733001076918a568ae78efa 100644 (file)
--- a/hw/yagl/yagl_inc/GL/glx.h
+++ b/hw/yagl/yagl_inc/GL/glx.h
@@ -28,7 +28,7 @@
 
 
 #ifdef __VMS
-#include <GL/vms_x_fix.h>
+#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 <GL/gl.h>
+#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 <GL/glxext.h>
+#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 304655e7c449e0653ac2c4e1150e2e1b99ea8690..f71494064bbf0f54c80a803b36ca28f52dd3c203 100644 (file)
--- a/hw/yagl/yagl_inc/GL/osmesa.h
+++ b/hw/yagl/yagl_inc/GL/osmesa.h
@@ -57,7 +57,7 @@ extern "C" {
 #endif
 
 
-#include <GL/gl.h>
+#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 f5f4f273ba9483c42ec7942b414e8e095e619189..a451dc539f7f9123b614b39031e32d3c18d15997 100644 (file)
--- 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 b2f09a1a3ac1c460826d5b5e5446a54584eea548..eff18332ca7924275964db68c3b47711a99e3b7d 100644 (file)
--- 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 <GL/gl.h>
+#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 38869df9064b23b6cce071b7702334d81da0c519..1afceb6512dc51984635378499da8ee7fc412607 100644 (file)
--- 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 <EGL/egl.h>
+#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 a322caf7d7d69516cd735f8eb0e0b293ccfd130e..fc85c8eba0b4749730229d2f499bd9a6e1d9c746 100644 (file)
--- 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