summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2016-09-27 22:44:18 +1000
committerJames Ross-Gowan <rossymiles@gmail.com>2016-09-28 21:38:52 +1000
commit3751065f9740244c95da963c0dd16a0bcd5b419c (patch)
tree78f13a6a1fcde648b14a414f21e82e7564ba9cbc /waftools
parentc239b7de7efbe3e87a9c09922c88e6a88777fb80 (diff)
downloadmpv-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 'waftools')
-rw-r--r--waftools/detections/compiler.py2
-rw-r--r--waftools/fragments/wasapi.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py
index 900128ce4c..5bbba87fd7 100644
--- a/waftools/detections/compiler.py
+++ b/waftools/detections/compiler.py
@@ -52,7 +52,7 @@ def __add_clang_flags__(ctx):
def __add_mswin_flags__(ctx):
ctx.env.CFLAGS += ['-D_WIN32_WINNT=0x0601', '-DUNICODE', '-DCOBJMACROS',
- '-U__STRICT_ANSI__']
+ '-DINITGUID', '-U__STRICT_ANSI__']
ctx.env.LAST_LINKFLAGS += ['-Wl,--major-os-version=6,--minor-os-version=0',
'-Wl,--major-subsystem-version=6,--minor-subsystem-version=0']
diff --git a/waftools/fragments/wasapi.c b/waftools/fragments/wasapi.c
index 5528ce171b..fbd2bb6e1b 100644
--- a/waftools/fragments/wasapi.c
+++ b/waftools/fragments/wasapi.c
@@ -1,7 +1,6 @@
#include <malloc.h>
#include <stdlib.h>
#include <process.h>
-#include <initguid.h>
#include <audioclient.h>
#include <endpointvolume.h>
#include <mmdeviceapi.h>