diff options
author | James Ross-Gowan <rossymiles@gmail.com> | 2016-09-27 22:44:18 +1000 |
---|---|---|
committer | James Ross-Gowan <rossymiles@gmail.com> | 2016-09-28 21:38:52 +1000 |
commit | 3751065f9740244c95da963c0dd16a0bcd5b419c (patch) | |
tree | 78f13a6a1fcde648b14a414f21e82e7564ba9cbc /video/out/opengl | |
parent | c239b7de7efbe3e87a9c09922c88e6a88777fb80 (diff) | |
download | mpv-3751065f9740244c95da963c0dd16a0bcd5b419c.tar.bz2 mpv-3751065f9740244c95da963c0dd16a0bcd5b419c.tar.xz |
win32: build with -DINITGUID
We always want to use __declspec(selectany) to declare GUIDs, but
manually including <initguid.h> in every file that used GUIDs was
error-prone. Since all <initguid.h> does is define INITGUID and include
<guiddef.h>, we can remove all references to <initguid.h> and just
compile with -DINITGUID to get the same effect.
Also, this partially reverts 622bcb0 by re-adding libuuid.a to the
build, since apparently some GUIDs (such as GUID_NULL) are not declared
in the source file, even when INITGUID is set.
Diffstat (limited to 'video/out/opengl')
-rw-r--r-- | video/out/opengl/context_angle.c | 1 | ||||
-rw-r--r-- | video/out/opengl/context_dxinterop.c | 1 | ||||
-rw-r--r-- | video/out/opengl/hwdec_d3d11egl.c | 1 | ||||
-rw-r--r-- | video/out/opengl/hwdec_d3d11eglrgb.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/video/out/opengl/context_angle.c b/video/out/opengl/context_angle.c index b0d637cebd..44aed340e3 100644 --- a/video/out/opengl/context_angle.c +++ b/video/out/opengl/context_angle.c @@ -15,7 +15,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include <initguid.h> #include <windows.h> #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/video/out/opengl/context_dxinterop.c b/video/out/opengl/context_dxinterop.c index 95b9296b3a..a4b979d8d4 100644 --- a/video/out/opengl/context_dxinterop.c +++ b/video/out/opengl/context_dxinterop.c @@ -17,7 +17,6 @@ #include <windows.h> #include <versionhelpers.h> -#include <initguid.h> #include <d3d9.h> #include <dwmapi.h> #include "osdep/windows_utils.h" diff --git a/video/out/opengl/hwdec_d3d11egl.c b/video/out/opengl/hwdec_d3d11egl.c index 4360286064..690609b5b9 100644 --- a/video/out/opengl/hwdec_d3d11egl.c +++ b/video/out/opengl/hwdec_d3d11egl.c @@ -15,7 +15,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include <initguid.h> #include <assert.h> #include <windows.h> #include <d3d11.h> diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index d43b1f503b..31e63eb8da 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -15,7 +15,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include <initguid.h> #include <assert.h> #include <windows.h> #include <d3d11.h> |