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.

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

Fixes to MSVC support for ci branch. #72

Merged
merged 37 commits into from
Jan 14, 2024

Conversation

Rossmaxx
Copy link

@Rossmaxx Rossmaxx commented Nov 16, 2023

I have been helping @JohannesLorenz with the ci branch for some time and have some fixes now. Here they are.

Note : To build on msvc properly, we should wait till liblo gets an updated release (or the workaround I used, which is to use --head while installing liblo on vcpkg. Though this step needs some debugging).

Copy link
Collaborator

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your submission. I added 3 comments with questions.

CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
@fundamental
Copy link
Owner

To move this PR forward, could there be a rebase onto our main branch to eliminate conflicts when this is merged and then a bit of git rebase magic to combine/fixup WIP/testing commits?

@JohannesLorenz
Copy link
Collaborator

@Rossmaxx I am still working with the liblo team to setup a new release. In the mean time, can you please fix at least the issues which are still open?

@fundamental That is what we usually do at the end. Right now, I do not want to touch it because it is already broken and I do not want to add more uncertainty to this PR. When the PR works, it should be the right time for a rebase.

@JohannesLorenz JohannesLorenz mentioned this pull request Jan 6, 2024
@Rossmaxx
Copy link
Author

Rossmaxx commented Jan 7, 2024

To move this PR forward, could there be a rebase onto our main branch to eliminate conflicts when this is merged and then a bit of git rebase magic to combine/fixup WIP/testing commits?

It would be of little use as this pr is not needed for master in any way and this only affects the ci branch. Merging ci with master after merging my pr is the best way imo.

If you are talking about squashing the commits, i would like to but don't know much about that. I remember messing up a rebase one time and lost all my commits.

@JohannesLorenz
Copy link
Collaborator

Thanks @Rossmaxx . I will merge this.

@JohannesLorenz
Copy link
Collaborator

Oh, sorry, I cannot merge. Can you please solve the conflicts?

@Rossmaxx
Copy link
Author

Oh, sorry, I cannot merge. Can you please solve the conflicts?

There's none for ci branch. You might be trying to merge master.

Btw did we get a new liblo release?

@JohannesLorenz JohannesLorenz merged commit fbd518f into fundamental:ci Jan 14, 2024
@JohannesLorenz
Copy link
Collaborator

Ah right, I could create a merge commit, only rebase was not possible.

For liblo, we were working on a new release until today. There might be a release in this month, possibly.

@Rossmaxx
Copy link
Author

For liblo, we were working on a new release until today. There might be a release in this month, possibly.

Notify me when it's done so that i can open a pr to add liblo's new version to vcpkg.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants