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 /wscript | |
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 'wscript')
-rw-r--r-- | wscript | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -135,7 +135,7 @@ main_dependencies = [ 'name': 'win32', 'desc': 'win32', 'deps_any': [ 'os-win32', 'os-cygwin' ], - 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'avrt', 'dwmapi']), + 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'uuid', 'avrt', 'dwmapi']), }, { 'name': '--win32-internal-pthreads', 'desc': 'internal pthread wrapper for win32 (Vista+)', |