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 ANGLE on Windows, Linux, and MacOS #3718

Merged
merged 10 commits into from
Jun 20, 2018

Conversation

robmikh
Copy link
Member

@robmikh robmikh commented Jun 13, 2018

This change fixes ANGLE to build on Windows, Linux, and MacOS.

On Windows, the fix was to move the control flow guard flag (/guard:cf) to the compile options. The rest of it built fine.

On Linux and MacOS, the solution was primarily to exclude all D3D renderers and open up the OpenGL renderer to other platforms (it was marked as WINDOWS_DESKTOP only).

The platform specific portions are wgl, glx, and cgl for Windows, Linux, and MacOS respectively.

@robmikh
Copy link
Member Author

robmikh commented Jun 13, 2018

This will fix #3321 and #3690. I couldn't find an issue filed for Linux.

@alexkaratarakis alexkaratarakis self-assigned this Jun 14, 2018
@robmikh
Copy link
Member Author

robmikh commented Jun 14, 2018

Hmm... it looks like I accidentally used a cached version of the binary in my Linux test project and didn't notice the ANGLE_USE_X11 compile definition being dropped. Testing Windows again and will push the fix (minor).

@alexkaratarakis alexkaratarakis merged commit e7591de into microsoft:master Jun 20, 2018
@alexkaratarakis
Copy link
Contributor

Thanks for the PR!

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