summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-10 09:59:25 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit8457cc9b9437f7fb5f63f56723e04636ad4768b6 (patch)
tree20c947c9425916645e67beb2e08afc1eccd44721
parentaef9cf2884f38473631a7f4d84bca84b6ec81d8b (diff)
Attempt to fix Win32 build.
-rw-r--r--src/wx/wscript2
-rw-r--r--wscript4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/wx/wscript b/src/wx/wscript
index 4d4dd0821..2b3bb46d6 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -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 0dc9594c7..cbecb0d21 100644
--- 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="""