Graphics rearrangement and probably breakage.

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index ffd77c6cb01483a5ec090bbe2c1b9842b93ab906..262f193e45efd8f48707b1624d90bc1623142dc5 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -28,13 +28,14 @@ def configure(conf):
 
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
-    uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE '
+    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']:
-        obj = bld(features = 'cxx cxxprogram')
+    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 = ['..']
         obj.use    = ['libdcpomatic2']
@@ -44,16 +45,17 @@ def build(bld):
             obj.install_path = None
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
-            obj = bld(features = 'cxx cxxprogram')
+        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:
                 obj.uselib += ' GTK'
+            obj.uselib += ' WXWIDGETS'
             obj.includes = ['..']
             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)