Mixxx

Merge lp:~stefan-derkits-net/mixxx/mixxx into lp:~mixxxdevelopers/mixxx/trunk

  1. mixxx
  2. Merge into trunk
Proposed by Horrendus
Status: Needs review
Proposed branch: lp:~stefan-derkits-net/mixxx/mixxx
Merge into: lp:~mixxxdevelopers/mixxx/trunk
Diff against target: 23 lines (+2/-0)
2 files modified
mixxx/build/features.py (+1/-0)
mixxx/vamp-plugins/SConscript (+1/-0)
To merge this branch: bzr merge lp:~stefan-derkits-net/mixxx/mixxx
Reviewer Review Type Date Requested Status
Daniel Schürmann Needs Information
RJ Skerry-Ryan Pending
Review via email: mp+102969@code.launchpad.net

Description of the change

These changes to the SCons build system were necessary to build mixxx on Kubuntu 12.04

To post a comment you must log in.
Revision history for this message
Daniel Schürmann (daschuer) wrote :

I cannot reproduce the issue.
I think it should be fixed by RJ in lp:mixxx #3069

Can you please verify it?

review: Needs Information
Reply

Unmerged revisions

3026. By Stefan Derkits <email address hidden>

fixes to build on (K)Ubuntu 12.04

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py 2012-04-16 04:00:01 +0000
+++ mixxx/build/features.py 2012-04-21 13:24:19 +0000
@@ -388,6 +388,7 @@
388 build.env.Append(CPPPATH=[self.INTERNAL_VAMP_PATH])388 build.env.Append(CPPPATH=[self.INTERNAL_VAMP_PATH])
389 self.INTERNAL_LINK = True389 self.INTERNAL_LINK = True
390390
391 conf.CheckLib('dl')
391 build.env.Append(CPPDEFINES = '__VAMP__')392 build.env.Append(CPPDEFINES = '__VAMP__')
392393
393 # FFTW3 support394 # FFTW3 support
394395
=== modified file 'mixxx/vamp-plugins/SConscript'
--- mixxx/vamp-plugins/SConscript 2012-04-14 17:59:03 +0000
+++ mixxx/vamp-plugins/SConscript 2012-04-21 13:24:19 +0000
@@ -56,6 +56,7 @@
56 ['%s/PluginAdapter.cpp',56 ['%s/PluginAdapter.cpp',
57 '%s/RealTime.cpp'])57 '%s/RealTime.cpp'])
5858
59 conf.CheckLib('dl')
59 env = conf.Finish()60 env = conf.Finish()
60 if build.platform_is_linux:61 if build.platform_is_linux:
61 env["LINKFLAGS"].append("-Wl,--version-script=vamp-plugins/vamp-plugin.map")62 env["LINKFLAGS"].append("-Wl,--version-script=vamp-plugins/vamp-plugin.map")