X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=bdf5cae81f4ab66a5ed5999f76f09f9f380d35bd;hb=88bb39c23e73041cdd7178414473a2223be277fa;hp=72d8ac9a80a225494e8f3a868f79ff99fa743633;hpb=267e21bfb78593bcb87eb24ce01b88d0859566f7;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index 72d8ac9a8..bdf5cae81 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -27,14 +27,14 @@ def configure(conf):
         conf.env.append_value('LINKFLAGS', ['-mconsole'])
 
 def build(bld):
-    uselib =  'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
+    uselib =  'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX '
     uselib += 'ICU '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'
 
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']:
         obj = bld(features='cxx cxxprogram')
         obj.uselib = uselib
         obj.includes = ['..']
@@ -45,7 +45,7 @@ def build(bld):
             obj.install_path = None
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
+        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm']:
             obj = bld(features='cxx cxxprogram')
             obj.uselib = uselib
             if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
@@ -55,7 +55,7 @@ def build(bld):
             obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../platform/windows/dcpomatic.rc'
+                obj.source += ' ../../platform/windows/%s.rc' % t
             obj.target = t.replace('dcpomatic', 'dcpomatic2')
 
         i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)