X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=bb3798aa70cdfba5bb03736eaa12c4c799df310f;hb=545f81b624f54d932c27f75ff0912d78098b4c8d;hp=018689e03d86058d92d3c7381b0d82bf48f99fa7;hpb=e7f7bf3a63c801a215d4b9832f01b8b27ee8944a;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index 018689e03..bb3798aa7 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -23,21 +23,21 @@ from waflib import Logs
 import i18n
 
 def configure(conf):
-    if conf.env.TARGET_WINDOWS:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         conf.env.append_value('CXXFLAGS', ['-mconsole'])
         conf.env.append_value('LINKFLAGS', ['-mconsole'])
 
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB '
-    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG LEQM_NRT '
+    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT '
 
     if bld.env.ENABLE_DISK:
         if bld.env.TARGET_LINUX:
             uselib += 'POLKIT '
         uselib += 'LWEXT4 NANOMSG '
 
-    if bld.env.TARGET_WINDOWS:
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER SETUPAPI '
     if bld.env.TARGET_LINUX:
         uselib += 'DL '
@@ -52,7 +52,7 @@ def build(bld):
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2']
         obj.source = '%s.cc' % t
-        if bld.env.TARGET_WINDOWS and t == 'dcpomatic_disk_writer':
+        if (bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32) and t == 'dcpomatic_disk_writer':
             obj.source += ' ../../platform/windows/%s.rc' % t
             # Prevent a console window opening when we start dcpomatic2_disk_writer
             obj.env.append_value('LINKFLAGS', '-Wl,-subsystem,windows')
@@ -76,10 +76,12 @@ def build(bld):
             obj.uselib += ' GL GLU'
         if bld.env.TARGET_LINUX:
             obj.uselib += ' X11'
+        if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
+            obj.uselib += ' GLEW'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
         obj.source = '%s.cc' % t
-        if bld.env.TARGET_WINDOWS:
+        if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
             obj.source += ' ../../platform/windows/%s.rc' % t
         obj.target = t.replace('dcpomatic', 'dcpomatic2')