X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=33a631e6e2679c4d735c2400d298ab48d0b7e719;hb=f227d182fa5a829fdeabf9eca8f33da5ce7f4e0d;hp=e767a87ca8af5404bb19e3f3bb6550600e0453eb;hpb=f7fb9aaad34234c87babdbda41642527354380bc;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index e767a87ca..33a631e6e 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,3 +1,21 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program 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.
+#
+#    This program 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 this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
 import os
 import glob
 from waflib import Logs
@@ -9,12 +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 += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX '
 
-    uselib =  'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP '
-    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 = bld(features='cxx cxxprogram')
         obj.uselib = uselib
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2']
@@ -25,10 +45,11 @@ def build(bld):
 
     if not bld.env.DISABLE_GUI:
         for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
-            obj = bld(features = 'cxx cxxprogram')
+            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