From 3bd44601d084d7139a81e787bd72fdf80832f2c3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2015 01:59:37 +0100 Subject: Possibly inaccurate port of master; build system cleanups. --- src/tools/wscript | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/tools/wscript') diff --git a/src/tools/wscript b/src/tools/wscript index 175cebc96..42aea9562 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,3 +1,21 @@ +# +# Copyright (C) 2012-2015 Carl Hetherington +# +# 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,9 +27,8 @@ def configure(conf): conf.env.append_value('LINKFLAGS', ['-mconsole']) def build(bld): - - 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 ' + uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' + uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' -- cgit v1.2.3 From bce51f69e4c4839f3e63f21b783c6a6fcd0ba4ae Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2015 11:38:09 +0100 Subject: Try to fix build. --- src/tools/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/wscript') diff --git a/src/tools/wscript b/src/tools/wscript index 42aea9562..c9b164ab8 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -28,7 +28,7 @@ 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' + uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' -- cgit v1.2.3 From 72dc4348693d6efdbdf5ad2e4fe76105192ff7bb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2015 12:58:49 +0100 Subject: More build fixes. --- src/tools/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/wscript') diff --git a/src/tools/wscript b/src/tools/wscript index c9b164ab8..35d6616a7 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -28,7 +28,7 @@ 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' + uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' -- cgit v1.2.3 From 8a98116d95dc3efd372650b291b8c6fcc705fac9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2015 22:01:13 +0100 Subject: More build fixes. --- src/tools/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/wscript') diff --git a/src/tools/wscript b/src/tools/wscript index 35d6616a7..ffd77c6cb 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -28,7 +28,7 @@ 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 WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE ' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' -- cgit v1.2.3