mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstgl: Porting fixes for MSVC with Meson

Browse source 
GL/gl.h needs windows.h on MSVC

WINAPI should not be used with MSVC. It also causes a build error.
This commit is contained in:
Nirbheek Chauhan 2016-10-27 07:30:19 +05:30 committed by Tim-Philipp Müller
parent 08e20ff131
commit 45ad33c94c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/gl/gstglapi.h
View file

@ -62,6 +62,9 @@
# include <OpenGL/gl3.h> # include <OpenGL/gl3.h>
# endif # endif
# else # else
# if defined(_MSC_VER)
# include <windows.h>
# endif
# include <GL/gl.h> # include <GL/gl.h>
# if defined(__WIN32__) || defined(_WIN32) # if defined(__WIN32__) || defined(_WIN32)
# include <GL/glext.h> # include <GL/glext.h>
@ -73,7 +76,7 @@
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#ifdef WINAPI #if defined(WINAPI) && !defined(_MSC_VER)
#define GSTGLAPI WINAPI #define GSTGLAPI WINAPI
#else #else
#define GSTGLAPI #define GSTGLAPI