diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-06-10 09:23:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-06-10 12:24:37 +0100 |
| commit | eee043737998021bb36fa202d68f1d7543f6ca6d (patch) | |
| tree | 659ed990ba7be81c85116f77eea7a8b3a8d3882e | |
| parent | 2a40e1217349b02f798f86b62a269a81b43022cd (diff) | |
Various build system fixes.v2.15.8
| -rw-r--r-- | src/tools/wscript | 6 | ||||
| -rw-r--r-- | src/wx/wscript | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index 06c712f0d..8fd23cfb3 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -37,11 +37,11 @@ def build(bld): cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': - cli_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid'] + 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_player', 'dcpomatic_playlist', 'dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid'] else: - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player'] + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] for t in cli_tools: obj = bld(features='cxx cxxprogram') diff --git a/src/wx/wscript b/src/wx/wscript index 5db943ab8..b04054a77 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.startswith('swaroop-'): + if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'): obj.source = sources + " swaroop_controls.cc" else: obj.source = sources |