Attempt to fix Win32 build.
authorCarl Hetherington <cth@carlh.net>
Mon, 10 Apr 2017 08:59:25 +0000 (09:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000 (23:04 +0100)
src/wx/wscript
wscript

index 4d4dd0821396710b7a7c418ebd6ba25344896da9..2b3bb46d6d8c6a8814b5ca5c6eb079006c901015 100644 (file)
@@ -209,7 +209,7 @@ def build(bld):
     if bld.env.TARGET_LINUX:
         obj.uselib += 'GTK '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 '
+        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER '
     obj.use = 'libdcpomatic2'
     obj.source = sources
     obj.target = 'dcpomatic2-wx'
diff --git a/wscript b/wscript
index 0dc9594c7365dc4d32de2ab0e440090e193249b1..cbecb0d219a405f31bc97641ac24448cce49d5e2 100644 (file)
--- a/wscript
+++ b/wscript
@@ -116,6 +116,10 @@ def configure(conf):
         conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
         conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
         conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
+        conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32")
+        conf.check(lib='dsound', uselib_store='DSOUND', msg="Checking for library dsound")
+        conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
+        conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread-mt'
         conf.check_cxx(fragment="""