X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=f36f0abefcb393f41df43b98fcc44fe769b8fd74;hb=4ae3f8614cfd2d61c647f264c2f5c85f6399571d;hp=f0ffb8e8994aafd60f1018d8db94d367b25cd5e3;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index f0ffb8e89..76c87598f 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,32 +1,68 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    DCP-o-matic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 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 ['makedcp', 'servomatic_cli', 'servomatictest']:
-        obj = bld(features = 'cxx cxxprogram')
-        obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+    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 NETTLE '
+
+    if bld.env.TARGET_WINDOWS:
+        uselib += 'WINSOCK2'
+
+    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    = ['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', 'servomatic_gui']:
-            obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+        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    = ['libdcpomatic', 'libdcpomatic-wx']
+            obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../windows/dcpomatic.rc'
-            obj.target = t
+                obj.source += ' ../../platform/windows/%s.rc' % 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_kdm.cc dcpomatic_server.cc', 'dcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')