Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libdjinterop external project dependency #2932

Merged
merged 5 commits into from
Jul 15, 2020
Merged

Add libdjinterop external project dependency #2932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bd92eb
Add libdjinterop external project dependency
mr-smidge Jul 11, 2020
0aa65b2
Make djinterop explicit opt-in.
mr-smidge Jul 12, 2020
5f7b77c
Use only CMake build from libdjinterop
mr-smidge Jul 12, 2020
3c73b2a
Build options named by feature rather than dependency
mr-smidge Jul 13, 2020
de24940
Merge branch 'master' into enh/djinterop-external-project
mr-smidge Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Build options named by feature rather than dependency
  • Loading branch information
@mr-smidge
mr-smidge committed Jul 13, 2020
commit 3c73b2a48e59b0ee6f944d73dca8af1a7dacbee3
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
cache: ccache
# Ubuntu Bionic build prerequisites
# TODO for Ubuntu Focal: Replace "-DFAAD=ON" with "-DFFMPEG=ON"
env: CMAKEFLAGS_EXTRA="-DDJINTEROP=ON -DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
env: CMAKEFLAGS_EXTRA="-DENGINEPRIME=ON -DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
before_install:
- export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
- export CTEST_PARALLEL_LEVEL="$(nproc)"
Expand Down
9 changes: 4 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,11 +1438,10 @@ if(WIN32)
target_link_libraries(mixxx-lib PUBLIC FFTW::FFTW)
endif()

# libdjinterop (must be enabled explicitly to use)
option(DJINTEROP "Use djinterop library" OFF)
if(DJINTEROP)
message(STATUS "Enabling djinterop support...")
target_compile_definitions(mixxx-lib PUBLIC __DJINTEROP__)
# Denon Engine Prime library export support (using libdjinterop)
option(ENGINEPRIME "Support for library export to Denon Engine Prime" OFF)
if(ENGINEPRIME)
target_compile_definitions(mixxx-lib PUBLIC __ENGINEPRIME__)

# Look for an existing installation of libdjinterop and use that if available.
# Otherwise, download and build from GitHub.
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ for:
-DBATTERY=ON
-DBROADCAST=ON
-DBULK=ON
-DDJINTEROP=ON
-DENGINEPRIME=ON
-DFFMPEG=ON
-DHID=ON
-DLILV=ON
Expand Down