Fix console tools on Windows.
authorCarl Hetherington <cth@carlh.net>
Wed, 5 Aug 2015 15:21:25 +0000 (16:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 5 Aug 2015 16:43:52 +0000 (17:43 +0100)
src/tools/wscript

index 429174058456e30c0ab8108b3181db61179e5f90..587d55c20a51566884ead9e401fa7ec92d6bda9b 100644 (file)
@@ -28,7 +28,7 @@ def configure(conf):
 
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
 
 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 BOOST_REGEX '
+    uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE BOOST_REGEX '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'
@@ -49,6 +49,7 @@ def build(bld):
             obj.uselib = uselib
             if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
                 obj.uselib += ' GTK'
             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
             obj.includes = ['..']
             obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
             obj.source = '%s.cc' % t