X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=175cebc96993b5a6e1345705bbf6153931744e74;hb=f6481c5613e8a03fc3a3361afe406e75171bd960;hp=b68926830e6faf2d8a330f9a6db1d67df5e4ecee;hpb=568e553f506809e753c78a0e0cbad5906bc002b1;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index b68926830..175cebc96 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -3,32 +3,46 @@ import glob
 from waflib import Logs
 import i18n
 
+def configure(conf):
+    if conf.env.TARGET_WINDOWS:
+        conf.env.append_value('CXXFLAGS', ['-mconsole'])
+        conf.env.append_value('LINKFLAGS', ['-mconsole'])
+
 def build(bld):
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm']:
+
+    uselib =  'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP XMLPP SSH '
+    uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL GLIB CAIROMM PANGOMM MAGICK '
+
+    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')
-        obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS'
+        obj.uselib = uselib
         obj.includes = ['..']
-        obj.use    = ['libdcpomatic']
+        obj.use    = ['libdcpomatic2']
         obj.source = '%s.cc' % t
-        obj.target = t
+        obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        if t == 'server_test':
+            obj.install_path = None
 
     if not bld.env.DISABLE_GUI:
         for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS ZIP QUICKMAIL'
-            if bld.env.STATIC:
+            obj.uselib = uselib
+            if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
                 obj.uselib += ' GTK'
             obj.includes = ['..']
-            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
+            obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
                 obj.source += ' ../../platform/windows/dcpomatic.rc'
-            obj.target = t
+            obj.target = t.replace('dcpomatic', 'dcpomatic2')
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc', 'dcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')