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

Fix compilation on Haiku OS #47

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Conversation

erysdren
Copy link
Collaborator

Just a small change to fix compilation on the Haiku operating system. Tested on hrev56578.

rott/rt_main.c Outdated
@@ -149,6 +154,15 @@ extern void RecordDemoQuery ( void );
int main (int argc, char *argv[])
{
extern char *BATTMAPS, *ROTTMAPS;
#ifdef __HAIKU__
Copy link
Owner

Choose a reason for hiding this comment

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

Why is this necessary? We only read/write files from/to ApogeePath, i.e. the result of GetPrefDir(), and only read files from the paths returned by FindFileByName(). Does any of these functions not work for you? If that's the case, I'd say we should go and fix it there instead of changing the directory to the executable just for Haiku.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ah sorry, this was a change applied to my sourceport fork because I was opening WADs from the executable's directory. In your sourceport it shouldn't be necessary. I'll remove it.

@fabiangreffrath fabiangreffrath merged commit a222280 into fabiangreffrath:main Jan 16, 2024
4 checks passed
@erysdren erysdren deleted the haiku branch January 17, 2024 04:52
@erysdren erysdren restored the haiku branch January 17, 2024 04:53
@erysdren erysdren deleted the haiku branch January 17, 2024 04:56
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