-
-
Notifications
You must be signed in to change notification settings - Fork 21.5k
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
Rebase patches for fixing haiku build. #20913
Conversation
I have a problem: clang-format complains that the includes are not ordered alphabetically. This is on purpose, kernel/image.h must be included before other system include files, because they include image.h and end up getting the one from godot instead of the one from system directories. Ideally, Godot would not add its own directories to system include directories, but only to local ones (using -iquote instead of -I for gcc) to avoid the problem. I'm not familiar enough with your buildsystem to do this, however. |
@pulkomandy
|
Alternatively leave a space between the entries. |
There was a build failure but it looks unrelated. What happened? |
@@ -77,7 +77,7 @@ void close_gl(void) { | |||
#include <dlfcn.h> | |||
static void* libGL; | |||
|
|||
#ifndef __APPLE__ | |||
#if !defined(__APPLE__) && !defined(__HAIKU__) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you see if you can get those changes upstreamed at https://github.com/Dav1dde/glad ? (would be in https://github.com/Dav1dde/glad/blob/946adccc7849757ee464f853fd3549d90f4a35b4/glad/lang/c/loader/__init__.py)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be merged upstream, I'll get to it tomorrow (maintainer of glad here).
@@ -44,6 +44,9 @@ | |||
#elif defined POSH_OS_FREEBSD | |||
# define NV_OS_FREEBSD 1 | |||
# define NV_OS_UNIX 1 | |||
#elif defined POSH_OS_HAIKU |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here, it would be great if you can try to get those changes upstreamed at https://github.com/Thekla/thekla_atlas.
Thanks a lot! Looks good to me. |
Upstream PRs submitted: |
As requested in #18310.