summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tools/wscript6
-rw-r--r--src/wx/wscript2
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