summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2016-01-11 13:16:42 -0800
committerRJ Ryan <rryan@mixxx.org>2016-01-11 13:21:44 -0800
commit471f0e63d03a6e793bd85a50eee2791cb0d8143c (patch)
treebe99be1d6a68f354eeeba953ff69b8dd3ac3b2bf /src
parentf2cd4a3118bd88bbd50620550794324c2de39ee8 (diff)
Use the actual env.Program result as an input to the copy Command.
If we don't do this then in some cases SCons won't copy mixxx out of the build folder when it should.
Diffstat (limited to 'src')
-rw-r--r--src/SConscript6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/SConscript b/src/SConscript
index 84dbd5e547..2b48530f2a 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -74,6 +74,12 @@ elif build.platform_is_osx:
else:
mixxx_bin = env.Program('mixxx', sources)
+# For convenience, copy the Mixxx binary out of the build directory to the
+# root. Don't do it on windows because the binary can't run on its own and needs
+# the DLLs present with it.
+if not build.platform_is_windows:
+ Command("../mixxx", mixxx_bin, Copy("$TARGET", "$SOURCE"))
+
test_bin = None
def build_tests():
global test_bin