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

Define Haiku assets path #7498

Closed
wants to merge 0 commits into from
Closed

Conversation

Peppersawce
Copy link
Contributor

@Peppersawce Peppersawce commented Oct 23, 2024

Hello everyone, some time ago I toyed with building the 1.5.3 DevilutionX release for Haiku OS, the binary + needed assets compiled without issues out of the box but due to some peculiarities of Haiku's build system the assets path has to be tweaked. I'm sparing you the details, I'll just say even if using a directory variable named "B_SYSTEM_DATA_DIRECTORY" might sound bad, it's totally normal due to the way the files are packaged for this OS.

Committing this as DevilutionX runs flawlessly on the OS (besides missing the needed libraries to enable ZeroTier) :)

EDIT: I only added about 10 lines via web interface (10-13 and 121-126) but the git diff shows the entire file as changed, I don't know what's up with that

@AJenbo
Copy link
Member

AJenbo commented Oct 23, 2024

Probably you ended up changing the line ending, what browser?

@Peppersawce
Copy link
Contributor Author

Falkon (aka Qupzilla), unfortunately browser choice is still pretty limited here :/

@AJenbo
Copy link
Member

AJenbo commented Oct 23, 2024

it might be submitting forms with Unix line ending but the HTML standard calls for Windows style line endings afaik. this probably isnt an issue on most projects but our files also use windows style line endings

@Peppersawce
Copy link
Contributor Author

Alright, yeah, I can see that being an issue. Should I act on it and redo the changes from a different environment?

@AJenbo
Copy link
Member

AJenbo commented Oct 23, 2024

ill fix it later

Source/utils/paths.cpp Outdated Show resolved Hide resolved
@AJenbo
Copy link
Member

AJenbo commented Oct 23, 2024

Move it after the if clause to allow for the path to still be manually overwritten using arguments.

It's merged manually.

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.

2 participants