Merge pull request #124 from slimsag/gles2_on_desktopstudio-master-releasestudio-1.3-releasedevel_glfw3.1

Allow use of OpenGL ES 2 on Desktop platforms with -tags=gles2

1 files changed, 6 insertions, 5 deletions

diff --git a/build.go b/build.go
index 3131cd3..cc0e224 100644
--- a/build.go
+++ b/build.go
@@ -1,12 +1,13 @@
 package glfw3
 
 /*
-// Choose OpenGL client on 386 and amd64.
-#cgo 386 CFLAGS: -D_GLFW_USE_OPENGL
-#cgo amd64 CFLAGS: -D_GLFW_USE_OPENGL
+// Standard OpenGL client is used on 386 and amd64 architectures, except when
+// explicitly asked for gles2 or wayland.
+#cgo 386,!gles2,!wayland CFLAGS: -D_GLFW_USE_OPENGL
+#cgo amd64,!gles2,!wayland CFLAGS: -D_GLFW_USE_OPENGL
 
-// Choose OpenGL ES V2 on arm.
-#cgo arm CFLAGS: -D_GLFW_USE_GLESV2
+// Choose OpenGL ES V2 on arm, or when explicitly asked for gles2/wayland.
+#cgo arm gles2 wayland CFLAGS: -D_GLFW_USE_GLESV2
 
 
 // Windows Build Tags