summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2016-05-01 01:49:38 +1000
committerJames Ross-Gowan <rossymiles@gmail.com>2016-05-01 21:10:24 +1000
commit622bcb0e37f39f2a542b42587ca442c6600b7414 (patch)
treef259c4decae00ab80e047031beabec4c03635e55 /wscript
parent9fda504d18bb8363353c82642f0a84ad0c94dec8 (diff)
downloadmpv-622bcb0e37f39f2a542b42587ca442c6600b7414.tar.bz2
mpv-622bcb0e37f39f2a542b42587ca442c6600b7414.tar.xz
win32: replace libuuid.a usage with initguid.h
Including initguid.h at the top of a file that uses references to GUIDs causes the GUIDs to be declared globally with __declspec(selectany). The 'selectany' attribute tells the linker to consolidate multiple definitions of each GUID, which would be great except that, in Cygwin and MinGW GCC 6.1, this method of linking makes the GUIDs conflict with the ones declared in libuuid.a. Since initguid.h obsoletes libuuid.a in modern compilers that support __declspec(selectany), add initguid.h to all files that use GUIDs and remove libuuid.a from the build. Fixes #3097
Diffstat (limited to 'wscript')
-rw-r--r--wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/wscript b/wscript
index a4ffce6031..061b14ee61 100644
--- a/wscript
+++ b/wscript
@@ -140,7 +140,7 @@ main_dependencies = [
'name': 'win32',
'desc': 'win32',
'deps_any': [ 'os-win32', 'os-cygwin' ],
- 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'uuid', 'avrt', 'dwmapi']),
+ 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'avrt', 'dwmapi']),
}, {
'name': '--win32-internal-pthreads',
'desc': 'internal pthread wrapper for win32 (Vista+)',