diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-18 14:22:19 +0100 |
| commit | 821908d2773d0ba9dd76126f1dbbb9759ba7c4ff (patch) | |
| tree | 8bef42bee1061ae474a9127b5e77bdcf5504dc71 /src | |
| parent | 16fee74d60a2da1beb11e3aa4f3305e68978d88a (diff) | |
Make 2.0 branch parallel installable with 1.x.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/wscript | 6 | ||||
| -rw-r--r-- | src/tools/wscript | 12 | ||||
| -rw-r--r-- | src/wx/wscript | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 7d74d462c..f26529b84 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -98,7 +98,7 @@ def build(bld): else: obj = bld(features = 'cxx cxxshlib') - obj.name = 'libdcpomatic' + obj.name = 'libdcpomatic2' obj.export_includes = ['..'] obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE @@ -118,9 +118,9 @@ def build(bld): if bld.env.BUILD_STATIC: obj.uselib += ' XMLPP' - obj.target = 'dcpomatic' + obj.target = 'dcpomatic2' - i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld) + i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld) def pot(bld): i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic') diff --git a/src/tools/wscript b/src/tools/wscript index c4ea1530f..f23eafd8b 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -13,9 +13,9 @@ def build(bld): obj = bld(features = 'cxx cxxprogram') obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL' 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 @@ -26,13 +26,13 @@ def build(bld): if bld.env.BUILD_STATIC: obj.uselib += ' GTK' obj.includes = ['..'] - obj.use = ['libdcpomatic', 'libdcpomatic-wx'] + obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: - obj.source += ' ../../platform/windows/dcpomatic.rc' - obj.target = t + obj.source += ' ../../platform/windows/dcpomatic2.rc' + 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_batch.cc', 'dcpomatic') diff --git a/src/wx/wscript b/src/wx/wscript index 719496ae7..bb1a1b76f 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -85,16 +85,16 @@ def build(bld): else: obj = bld(features = 'cxx cxxshlib') - obj.name = 'libdcpomatic-wx' + obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] obj.uselib = 'WXWIDGETS DCP' if bld.env.TARGET_LINUX: obj.uselib += ' GTK' - obj.use = 'libdcpomatic' + obj.use = 'libdcpomatic2' obj.source = sources - obj.target = 'dcpomatic-wx' + obj.target = 'dcpomatic2-wx' - i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld) + i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld) def pot(bld): i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx') |