diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-07 21:23:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-07 21:23:40 +0000 |
| commit | c09d415cac646bfd3067f359ca454dc5ea3679e5 (patch) | |
| tree | 5846cce350d1bf323bf9aaaed0bfaa9f6a69f0cd /src | |
| parent | b4ec9ce787c63b27c96c404b1bd44eccd56ab16e (diff) | |
Allow static builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/wscript | 6 | ||||
| -rw-r--r-- | src/tools/wscript | 3 | ||||
| -rw-r--r-- | src/wx/wscript | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 0d3c7d99d..c1786bb81 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -1,5 +1,9 @@ def build(bld): - obj = bld(features = 'cxx cxxshlib') + if bld.env.STATIC: + obj = bld(features = 'cxx cxxstlib') + else: + obj = bld(features = 'cxx cxxshlib') + obj.name = 'libdvdomatic' obj.export_includes = ['.'] obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB' diff --git a/src/tools/wscript b/src/tools/wscript index 9c1ca7524..c8601ad1f 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,7 +1,7 @@ def build(bld): for t in ['makedcp', 'fixlengths', 'servomatic_cli']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD' + obj.uselib = 'BOOST_THREAD DCP' obj.includes = ['..'] obj.use = ['libdvdomatic'] obj.source = '%s.cc' % t @@ -10,6 +10,7 @@ def build(bld): if not bld.env.DISABLE_GUI: for t in ['dvdomatic', 'servomatic_gui']: obj = bld(features = 'cxx cxxprogram') + obj.uselib = 'DCP' obj.includes = ['..'] obj.use = ['libdvdomatic', 'libdvdomatic-wx'] obj.source = '%s.cc' % t diff --git a/src/wx/wscript b/src/wx/wscript index d425c3e05..4dbb04eea 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -2,7 +2,11 @@ def configure(conf): conf.check_cfg(package = '', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True) def build(bld): - obj = bld(features = 'cxx cxxshlib') + if bld.env.STATIC: + obj = bld(features = 'cxx cxxstlib') + else: + obj = bld(features = 'cxx cxxshlib') + obj.name = 'libdvdomatic-wx' obj.includes = [ '..' ] obj.export_includes = ['.'] |