diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-06-10 00:21:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-06-10 00:21:12 +0100 |
| commit | 78471c43c0c55fb9b25b4beb03dd861439da4f40 (patch) | |
| tree | 4c22a0c1bbf3b844005f96a2a6f24d39cac91b09 /src | |
| parent | 25b1934f24206b6dda5ce5a7686930d605ff6ccc (diff) | |
swaroop: try to make -theater and -studio variants.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/wscript | 12 | ||||
| -rw-r--r-- | src/wx/wscript | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index 0316137af..8f94d10f9 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -36,10 +36,12 @@ def build(bld): uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' cli_tools = [] - if bld.env.VARIANT != "swaroop": - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] + if bld.env.VARINT == 'swaroop-theater': + cli_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid'] + elif bld.env.VARIANT == "swaroop-studio": + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_ecinema', 'dcpomatic_uuid'] else: - cli_tools = ['dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = 'dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player'] for t in cli_tools: obj = bld(features='cxx cxxprogram') @@ -53,8 +55,8 @@ def build(bld): gui_tools = [] if not bld.env.DISABLE_GUI: - if bld.env.VARIANT == 'swaroop': - gui_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_kdm'] + if bld.env.VARIANT == 'swaroop-theater': + gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] else: gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] diff --git a/src/wx/wscript b/src/wx/wscript index 9be062be5..5db943ab8 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -293,7 +293,7 @@ def build(bld): if bld.env.TARGET_OSX: obj.framework = ['CoreAudio', 'OpenGL'] obj.use = 'libdcpomatic2' - if bld.env.VARIANT == 'swaroop': + if bld.env.VARIANT.startswith('swaroop-'): obj.source = sources + " swaroop_controls.cc" else: obj.source = sources |