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

Jump to bottom

.o2r support #3955

Merged
merged 46 commits into from Mar 3, 2024
Merged

.o2r support #3955

merged 46 commits into from Mar 3, 2024

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Feb 19, 2024 •
edited by github-actions bot

some testing only changes exist here #3953

this includes a submodule bump to latest LUS

Build Artifacts

@briaguya-ai
we crash if we try to SPDLOG in the destructors
327d305
@briaguya-ai
rip em out
738a9b8
@briaguya-ai
newline
8ee3e73
@briaguya-ai
test meta files
f5d2e58
@briaguya-ai
clang formatted
6d3e312
@briaguya-ai
test loading from soh.zip
4934ad8
@briaguya-ai
actually use submodule
8f78ae0
@briaguya-ai
with the changes
22d9e0d
@briaguya-ai
apt deps
0a5e6a4
@briaguya-ai
cmake is a libzip 1.7.0+ thing, let's see what has it
46bbf79
@briaguya-ai
drop compat for now
1c693a2
@briaguya-ai
vcpkg
19a6517
@briaguya-ai
hacking in brew because why not
98b2f96
@briaguya-ai
brew
f7e6237
@briaguya-ai
using trash branch of lus to try to get libzip to work
74e55fe
@briaguya-ai
caps?
bc5f307
@briaguya-ai
back to the version of LUS i actually like
87fc48f
@briaguya-ai
brew libzip worked on the LUS side hopefully it works here
0ec0716
@briaguya-ai
manual install?
6282974
@briaguya-ai
try macports
75405a8
@briaguya-ai
does +universal not work on libzip?
cae5948
@briaguya-ai
bring back +universal
d9b2dd0
@briaguya-ai
wii u try a thing
61c6245
@briaguya-ai
was it a cmake conflict?
69b615e
@briaguya-ai
what happened with brew again?
67b80ed
@briaguya-ai
why won't mac find this?
82c9768
@briaguya-ai
that didn't fix it either...
5be1fc3
@briaguya-ai
wiiu cmake libzip shenans?
583be7e
@briaguya-ai
switch
1c51cd3
@briaguya-ai
actually download the thing
3192f1e
@briaguya-ai briaguya-ai added the do not merge Not ready or not valid changes label Feb 19, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 19, 2024

⚠️ The sha of the head commit of this PR conflicts with #3953. Mergify cannot evaluate rules on this PR. ⚠️

@briaguya-ai briaguya-ai marked this pull request as ready for review February 20, 2024 00:13
@briaguya-ai briaguya-ai removed the do not merge Not ready or not valid changes label Feb 20, 2024
@briaguya-ai briaguya-ai merged commit ebde648 into HarbourMasters:develop Mar 3, 2024
8 checks passed
@briaguya-ai briaguya-ai deleted the o2r-support branch March 3, 2024 01:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Archez Archez Archez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@briaguya-ai @Archez