build fixes for freebsd#1822
Closed
sambler wants to merge 4 commits into
Closed
Conversation
Member
|
Thanks!! @lukas-w seems to have taken over as our CMake resident expert, so he should probably be the one to merge. 👍 |
Member
There was a problem hiding this comment.
Can you try adding
INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE_DIRS})`to CMakeLists.txt instead?
Member
|
@sambler please address Lukas' question and rebase this PR against upstream. 👍 |
Member
|
@sambler once you rebase this PR, we can merge. Sorry for the inconvenience. |
Member
|
@sambler, again, if you have time to rebase this PR, we'll merge it in for you. 👍 |
Member
|
Actually... @curlymorphic if you have some time, these fixes should really go in and they're tremendously simple. If you have time, could you patch them into a new PR so we can close this out? We really need to get 1.2 ready. 👍 |
Contributor
|
sure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I need to make these small changes to compile on FreeBSD. The first two are #if based to only effect FreeBSD.
I would expect adding the SAMPLERATE_INCLUDE_DIRS to plugins/CMakeLists.txt would be needed for any platform.
In plugins/zynaddsubfx/CMakeLists.txt using CMAKE_DL_LIBS instead of -ldl is better for cross platform building. Though I'm not sure if this will stick with zynaddsubfx updates.