Guard OPENGL_LIB dependent code #152
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This guards the epoxy_gl_dlsym code that depends on the OPENGL_LIB define. This fixes building for Android or Windows.
ebassi
requested changes
Feb 23, 2018
| @@ -648,7 +648,7 @@ epoxy_gl_dlsym(const char *name) | |||
| return do_dlsym(&api.gl_handle, | |||
| "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", | |||
| name, true); | |||
| #else | |||
| #elif defined(OPENGL_LIB) | |||
There was a problem hiding this comment.
I'm not sure this is correct.
The #if defined(OPENGL_LIB) ... #endif block should only be used around the:
if (!api.gl_handle)
get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false);block. The following block will call dlsym() if the gl_handle is set, and if it isn't, it'll do a dlopen().
The only difference between the Android and Linux paths is that on Linux there's an OPENGL_LIB define in the latter but not in the former.
There was a problem hiding this comment.
The commit message is also not really accurate: the Windows conditional path already exists.
|
I ended up pushing a possible fix; please, feel free to re-open if the build still fails. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This guards the epoxy_gl_dlsym code that depends on the OPENGL_LIB
define. This fixes building for Android or Windows.