Use GetCommandLineW() to get a UTF16-encoded command line on Windows (#2248).

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index 4b90995c785998e150991a07ffc235683a7ca397..be5297beb06e8cee0f1ac1f6acf73fc49ca905dd 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -30,7 +30,7 @@ def configure(conf):
 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:
@@ -62,7 +62,7 @@ def build(bld):
 
     gui_tools = []
     if not bld.env.DISABLE_GUI:
-        gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_combiner']
+        gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_combiner', 'dcpomatic_editor']
         if bld.env.ENABLE_DISK:
             gui_tools.append('dcpomatic_disk')
 
@@ -76,6 +76,8 @@ 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