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

submodule lus #1943

Merged
merged 34 commits into from Nov 14, 2022
Merged

submodule lus #1943

merged 34 commits into from Nov 14, 2022

Conversation

briaguya-ai
Copy link
Contributor

No description provided.

briaguya-ai and others added 11 commits November 8, 2022 22:23
* remove lus

* add lus submodule

* some progress, still not sure how to get ZAPDUtils to link to ZAPD correctly

* remove submodule to use fork

* forked submodule for now

* submodule stuff

* getting somewhere with soh build

* Some small updates

* update submodule and fix condition variable error

* lus pulseaudio fix

* Update CMakeLists.txt

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
@dcvz dcvz force-pushed the new-dev branch 2 times, most recently from be014e7 to 08c7cb1 Compare November 10, 2022 08:56
@dcvz dcvz force-pushed the new-dev branch 4 times, most recently from 3cad685 to 73bfbcb Compare November 10, 2022 14:54
dcvz and others added 4 commits November 10, 2022 16:19
Not sure if this was affecting anything but it definitely was adding a
subdirectory that did not exist.
leggettc18 and others added 5 commits November 13, 2022 00:05
* Fixes typo in add_subdirectory for libultraship.

Not sure if this was affecting anything but it definitely was adding a
subdirectory that did not exist.

* Fixes switch builds

(dependent on changes from https://github.com/briaguya-ai/libultraship/pull/4)
@@ -240,7 +240,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
{
word0 = 0;
word1 = 0;
spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data)));
// spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data)));
Copy link
Contributor

Choose a reason for hiding this comment

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

let's fix this correctly as we have the other?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i don't remember where the other proper fix is

@dcvz dcvz merged commit 3914781 into HarbourMasters:develop Nov 14, 2022
@briaguya-ai briaguya-ai deleted the new-dev branch November 25, 2022 07:52
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.

None yet

3 participants