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

glfw: Sync our GLFW with upstream master #678

Merged
merged 4 commits into from
Jan 8, 2019
Merged

Conversation

a3f
Copy link
Contributor

@a3f a3f commented Oct 27, 2018

glfw/glfw@5595fa3 implements a proper fix for the macOS Mojave
problem of OpenGL windows not being rendered until moved or manually
updated.

Pull in the current master and rebase the two commits we have for reuse
of the GLFW CMake build system for Wayland on top. It hasn't been merged
(or acknowledged..) upstream yet.

Fixes #655 and #665.

@a3f
Copy link
Contributor Author

a3f commented Oct 27, 2018

Will fix the Windows build error later

@a3f a3f self-assigned this Oct 27, 2018
@raysan5
Copy link
Owner

raysan5 commented Oct 31, 2018

Just note that src/external/glfw/include/GLFW/glfw3native.h was modified by me for raylib to avoid conflicting symbols with windows.h.

@raysan5
Copy link
Owner

raysan5 commented Jan 2, 2019

@a3f any news on this PR?

@a3f a3f force-pushed the update-glfw branch 2 times, most recently from dd18eef to 1d6ba68 Compare January 6, 2019 14:29
@a3f
Copy link
Contributor Author

a3f commented Jan 6, 2019

I've fixed the Windows build error, but Travis still fails because of the RL_RG commit.

@raysan5
Copy link
Owner

raysan5 commented Jan 6, 2019

@a3f Thanks for reporting, it should be ok in commit f4fe7f4.

By the way, could you take a look to #681, tried to test Windows support for Travis CI but it keeps failing...

Move away from v1.12 as GLFW now requires >= 1.15.
glfw/glfw@5595fa3ae6 implements a proper fix for the macOS Mojave
problem of OpenGL windows not being rendered until moved or manually
updated.

Pull in the current master and rebase the three patches we have on top:
- two commits we have for reuse of the GLFW CMake build system for Wayland
It hasn't yet to be acknowledged upstream.
- one commit removing #include <windows.h> in glfw3native.h to avoid
duplicate declarations.

Fixes raysan5#655 and raysan5#665.
…S Mojave"

This reverts commit 1fe6d9f.

Because upstream GLFW now contains a fix.
@a3f a3f merged commit 8bc4050 into raysan5:master Jan 8, 2019
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