diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-02-27 23:50:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-29 21:51:47 +0100 |
| commit | adeab682b76138d7a05bab3943af23cd57e2bc57 (patch) | |
| tree | 4e0aaaf989365b2f907a9be4df8b6d16d02b9ee5 /src/tools | |
| parent | c403e757cf0b029954fe18dc969314bfb179412f (diff) | |
Move swaroop playlist editor stuff into its own swaroop_
files.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/swaroop_dcpomatic_ecinema.cc (renamed from src/tools/dcpomatic_ecinema.cc) | 0 | ||||
| -rw-r--r-- | src/tools/swaroop_dcpomatic_playlist.cc (renamed from src/tools/dcpomatic_playlist.cc) | 4 | ||||
| -rw-r--r-- | src/tools/swaroop_dcpomatic_uuid.cc (renamed from src/tools/dcpomatic_uuid.cc) | 0 | ||||
| -rw-r--r-- | src/tools/wscript | 16 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/tools/dcpomatic_ecinema.cc b/src/tools/swaroop_dcpomatic_ecinema.cc index 152194c48..152194c48 100644 --- a/src/tools/dcpomatic_ecinema.cc +++ b/src/tools/swaroop_dcpomatic_ecinema.cc diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/swaroop_dcpomatic_playlist.cc index de6ae107b..73fcbf802 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/swaroop_dcpomatic_playlist.cc @@ -27,8 +27,8 @@ #include "../lib/cross.h" #include "../lib/film.h" #include "../lib/dcp_content.h" -#include "../lib/spl_entry.h" -#include "../lib/spl.h" +#include "../lib/swaroop_spl_entry.h" +#include "../lib/swaroop_spl.h" #include <wx/wx.h> #include <wx/listctrl.h> #include <wx/imaglist.h> diff --git a/src/tools/dcpomatic_uuid.cc b/src/tools/swaroop_dcpomatic_uuid.cc index 65582ac0c..65582ac0c 100644 --- a/src/tools/dcpomatic_uuid.cc +++ b/src/tools/swaroop_dcpomatic_uuid.cc diff --git a/src/tools/wscript b/src/tools/wscript index 3b2c0a04c..710f49eeb 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -37,9 +37,9 @@ def build(bld): cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': - cli_tools = [ 'dcpomatic_uuid'] - elif bld.env.VARIANT == "swaroop-studio": - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = ['swaroop_dcpomatic_uuid'] + elif bld.env.VARIANT == 'swaroop-studio': + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'swaroop_dcpomatic_ecinema', 'swaroop_dcpomatic_uuid'] else: cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] @@ -49,16 +49,18 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') if t == 'server_test': obj.install_path = None gui_tools = [] if not bld.env.DISABLE_GUI: if bld.env.VARIANT == 'swaroop-theater': - gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic_player', 'swaroop_dcpomatic_playlist'] + elif bld.env.VARIANT == 'swaroop-studio': + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist'] else: - gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player'] for t in gui_tools: obj = bld(features='cxx cxxprogram') @@ -75,7 +77,7 @@ def build(bld): obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: obj.source += ' ../../platform/windows/%s.rc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) |