diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2018-12-28 14:50:02 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2018-12-28 14:50:02 +0100 |
| commit | 11a27cfb1679e042fd8643ff2946a3b4f1f1fb17 (patch) | |
| tree | 556c47c0109359216c0d7408393a2c2aa4f1ed2d /build | |
| parent | d7bc6fbf94a667881e2dda9776398b65bfc9f722 (diff) | |
| parent | 296f4b52f1ab70673aeefc7c00761f825fe10aa5 (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into lp1737537_analysis_revamp
Diffstat (limited to 'build')
| -rw-r--r-- | build/appveyor/build_mixxx.bat | 2 | ||||
| -rw-r--r-- | build/depends.py | 1 | ||||
| -rw-r--r-- | build/features.py | 16 |
3 files changed, 15 insertions, 4 deletions
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat index e9f08e4b82..69e8371bf9 100644 --- a/build/appveyor/build_mixxx.bat +++ b/build/appveyor/build_mixxx.bat @@ -78,7 +78,7 @@ SET BIN_DIR=%WINLIB_DIR%\bin SET LIB_DIR=%WINLIB_DIR%\lib SET INCLUDE_DIR=%WINLIB_DIR%\include REM TODO(rryan): Remove hard-coding of Qt version. -set QT_VERSION=5.11.2 +set QT_VERSION=5.12.0 SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION% if NOT EXIST "%BIN_DIR%\scons.py" ( diff --git a/build/depends.py b/build/depends.py index db545d6a62..4949088730 100644 --- a/build/depends.py +++ b/build/depends.py @@ -377,6 +377,7 @@ class Qt(Dependence): build.env.Append(LIBS = 'userenv') # qt5core build.env.Append(LIBS = 'uxtheme') # ? build.env.Append(LIBS = 'version') # ? + build.env.Append(LIBS = 'wtsapi32') # ? build.env.Append(LIBS = 'qtfreetype') build.env.Append(LIBS = 'qtharfbuzz') diff --git a/build/features.py b/build/features.py index b60b5ba06a..68469f0ffe 100644 --- a/build/features.py +++ b/build/features.py @@ -355,14 +355,18 @@ class Vamp(Feature): # If there is no system vamp-hostsdk is installed or if the version # of the installed vamp-hostsdk is less than the bundled version, # then we'll directly link the bundled vamp-hostsdk - if not conf.CheckLib('vamp-hostsdk') or not conf.CheckForPKG('vamp-plugin-sdk', '2.7.1'): + # Note: We're adding vamp-hostsdk to LIBS in sources(), so + # don't add it now in order to prevent duplication. + if not conf.CheckLib('vamp-hostsdk', autoadd=False) or not conf.CheckForPKG('vamp-plugin-sdk', '2.7.1'): self.INTERNAL_LINK = True build.env.Append(CPPPATH=['#' + self.INTERNAL_VAMP_PATH]) # Needed on Linux at least. Maybe needed elsewhere? if build.platform_is_linux: # Optionally link libdl Required for some distros. - conf.CheckLib(['dl', 'libdl']) + # Note: We can't add dl to LIBS here because it needs to be added after vamp-hostsdk. + # See: https://bugs.launchpad.net/mixxx/+bug/1804411 + conf.CheckLib(['dl', 'libdl'], autoadd=False) # FFTW3 support have_fftw3_h = conf.CheckHeader('fftw3.h') @@ -383,7 +387,13 @@ class Vamp(Feature): env.SConscript(env.File('SConscript', vamp_dir)) build.env.Append(LIBPATH=self.INTERNAL_VAMP_PATH) - build.env.Append(LIBS=['vamp-hostsdk']) + + # Add this here unconditionally because we're not adding it in configure(). + build.env.Append(LIBS=['vamp-hostsdk']) + + # Ubuntu requires dl to be specified after vamp-hostsdk. + if build.platform_is_linux: + build.env.Append(LIBS=['dl']) return ['src/analyzer/vamp/vampanalyzer.cpp', 'src/analyzer/vamp/vamppluginadapter.cpp', |