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

Win32: resolve some symbols re-definition of windows.h in glfw3native.h #2643

Merged
merged 2 commits into from
Aug 21, 2022

Conversation

daipom
Copy link
Contributor

@daipom daipom commented Aug 17, 2022

This reflects GLFW's fix: glfw/glfw#1348

Currently, we can't build raylib with an external GLFW in Win32
since some symbol re-definition errors occur.

The internal GLFW in raylib seems to avoid this problem by customizing glfw3native.h: 2feea87

This fix enables building with an external GLFW in Win32 without any customization,
if it contains the fix of glfw/glfw#1348.

This fix is compatible with the current internal GLFW too.

If we update the internal GLFW to the latest before we merge this branch,
we don't need the commit: 6609c68.
In that case, I will remove that commit from this branch.

This reflects GLFW's fix: glfw/glfw#1348

This enables to build with a external GLFW containing the
following fix:

* glfw/glfw@05f6c13

Currently, glfw3native.h of the internal GLFW is customized at
raysan5@2feea87

This fix is compatible with the current customized glfw3native.h.

This fix enables us to update it to the latest and remove the
customization.
@raysan5
Copy link
Owner

raysan5 commented Aug 19, 2022

@daipom Oh! That's great! I lost track of that issue long ago! Nice to see a review has been implemented! It will also make it easy to update GLFW!

@raysan5 raysan5 merged commit 7bb8ffc into raysan5:master Aug 21, 2022
@raysan5
Copy link
Owner

raysan5 commented Aug 21, 2022

@daipom Thanks for the update! Merged!

@daipom
Copy link
Contributor Author

daipom commented Aug 22, 2022

Thanks for merging!

In fact, we are developing IME support in GLFW to allow Japanese input, etc.

We would like to use this feature in raylib too once we have finished developing it in GLFW.
Perhaps we need to add some corresponding APIs.

Please let me discuss this with you again on issues and PR!

@kou kou deleted the win32-fix-including-glfw-native branch August 22, 2022 01:44
@raysan5
Copy link
Owner

raysan5 commented Aug 22, 2022

In fact, we are developing IME support in GLFW to allow Japanese input, etc.

That's amazing! I've been asked several times to support it on raylib! We can add that feature to raylib when ready!

Please note that raylib GLFW is not updated at the moment, I was waiting for the 3.4 official release of the library but it seems it's taking longer than expected...

@daipom
Copy link
Contributor Author

daipom commented Aug 22, 2022

Thanks so much!

We are trying to get that feature into GLFW v3.4!
I would appreciate the update when GLFW v3.4 is released!

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.

Avoid including <windows.h>, only HWND typedef is required
2 participants