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.

Sign up for GitHub

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

Jump to bottom

fix: making gl thing to compile and work on apple silicon #1922

Merged
merged 3 commits into from Feb 20, 2021
Merged

fix: making gl thing to compile and work on apple silicon #1922

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44d2d4a
fix: making gl thing to compile and work on apple silicon
sirkon Feb 7, 2021
5648e2a
fix: some boolean algebra applied
sirkon Feb 8, 2021
f93d4e0
fix: darwin is pure desktop with gl core to use
sirkon Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/driver/glfw/glfw_es.go
View file
Open in desktop
@@ -1,5 +1,5 @@
// +build gles arm arm64
// +build !arm64,!darwin
// +build !arm64,darwin arm64,!darwin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based on previous comments, I think this should be just one line:
// +build gles arm arm64,!darwin
i.e. build on any arm64 but not Darwin.


package glfw

Expand Down
2 changes: 1 addition & 1 deletion internal/painter/gl/gl_core.go
View file
Open in desktop
@@ -1,4 +1,4 @@
// +build !gles,!arm,!android,!ios,!mobile amr64,darwin
// +build !gles,!arm,!arm64,!android,!ios,!mobile arm64,darwin

package gl

Expand Down
3 changes: 2 additions & 1 deletion internal/painter/gl/gl_es.go
View file
Open in desktop
@@ -1,5 +1,6 @@
// +build gles arm arm64,!darwin
// +build gles arm arm64
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the previous change in this file was good.
it is compiled on M1 with previous changes.

// +build !android,!ios,!mobile
// +build !arm64,darwin arm64,!darwin

package gl

Expand Down