X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=38d986f25fe0af7ae42383af65dc5fea56cc6bbf;hp=ee4e7edefc38f8c2c500653fe926e02cbf1f0309;hb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;hpb=42866530db49e0faf367ad28a55c658be60951bf

diff --git a/src/tools/wscript b/src/tools/wscript
index ee4e7edef..38d986f25 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -4,29 +4,29 @@ from waflib import Logs
 import i18n
 
 def build(bld):
-    for t in ['makedcp', 'servomatic_cli', 'servomatictest']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
         obj = bld(features = 'cxx cxxprogram')
-        obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+        obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
         obj.includes = ['..']
-        obj.use    = ['libdvdomatic']
+        obj.use    = ['libdcpomatic']
         obj.source = '%s.cc' % t
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']:
+        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+            obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
             obj.includes = ['..']
-            obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
+            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../platform/windows/dvdomatic.rc'
+                obj.source += ' ../../platform/windows/dcpomatic.rc'
             obj.target = t
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dvdomatic', bld)
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'tools'), 'dvdomatic')
+    i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')