diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-27 07:30:19 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-27 23:06:25 +0530 |
| commit | d5dba89fc032ba13c9b220208af98b42a1cd527e (patch) | |
| tree | 923d84cb3855d63d6dffca772ac0d37ed0164b4e | |
| parent | 86e75e5c903a68096763b00e5b7f8058c93e64e0 (diff) | |
| download | gstreamer-plugins-bad-d5dba89fc032ba13c9b220208af98b42a1cd527e.tar.gz | |
gstgl: Porting fixes for MSVC with Meson
GL/gl.h needs windows.h on MSVC
WINAPI should not be used with MSVC. It also causes a build error.
| -rw-r--r-- | gst-libs/gst/gl/gstglapi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index 93b60b792..43e6d4a68 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -62,6 +62,9 @@ # include <OpenGL/gl3.h> # endif # else +# if defined(_MSC_VER) +# include <windows.h> +# endif # include <GL/gl.h> # if defined(__WIN32__) || defined(_WIN32) # include <GL/glext.h> @@ -73,7 +76,7 @@ #pragma GCC diagnostic pop #endif -#ifdef WINAPI +#if defined(WINAPI) && !defined(_MSC_VER) #define GSTGLAPI WINAPI #else #define GSTGLAPI |