commit d5e078356ceaa564d453d4abadf82dc1950990d0
author Hajime Hoshi <hajimehoshi@gmail.com> Wed Jun 15 12:07:12 2016 +0900
committer David Crawshaw <crawshaw@golang.org> Wed Jun 15 15:09:20 2016 +0000
tree f489aee035f76bbdb050855424a54abdc6ad49d5
parent d53576ecbc248cca0c30203c6ef27e88b1d36652

x/mobile/gl: Fix macro definitions for iOS

Now `gomobile bind -target ios` tries to compile a lib with
`darwin/arm`, `darwin/arm64`, and `darwin/amd64`. In the last
case, a tag `ios` is always added. In `x/mobile/gl`, the last case
`darwin/arm64` was not considered well and causes a compile error.
This CL fixes this compile error.

Fixes golang/go#16067

Change-Id: I56be73f373d9985c067a07e5084fa6b9f1ef76a0
Reviewed-on: https://go-review.googlesource.com/24140
Reviewed-by: David Crawshaw <crawshaw@golang.org>

gl/work.go

diff --git a/gl/work.go b/gl/work.go
index b6b8c0d..574b03b 100644
--- a/gl/work.go
+++ b/gl/work.go
@@ -7,16 +7,18 @@
 package gl
 
 /*
-#cgo darwin,amd64  LDFLAGS: -framework OpenGL
-#cgo darwin,arm    LDFLAGS: -framework OpenGLES
-#cgo darwin,arm64  LDFLAGS: -framework OpenGLES
-#cgo linux         LDFLAGS: -lGLESv2
+#cgo ios                LDFLAGS: -framework OpenGLES
+#cgo darwin,amd64,!ios  LDFLAGS: -framework OpenGL
+#cgo darwin,arm         LDFLAGS: -framework OpenGLES
+#cgo darwin,arm64       LDFLAGS: -framework OpenGLES
+#cgo linux              LDFLAGS: -lGLESv2
 
-#cgo android       CFLAGS: -Dos_android
-#cgo darwin,amd64  CFLAGS: -Dos_osx
-#cgo darwin,arm    CFLAGS: -Dos_ios
-#cgo darwin,arm64  CFLAGS: -Dos_ios
-#cgo linux         CFLAGS: -Dos_linux
+#cgo android            CFLAGS: -Dos_android
+#cgo ios                CFLAGS: -Dos_ios
+#cgo darwin,amd64,!ios  CFLAGS: -Dos_osx
+#cgo darwin,arm         CFLAGS: -Dos_ios
+#cgo darwin,arm64       CFLAGS: -Dos_ios
+#cgo linux              CFLAGS: -Dos_linux
 
 #include <stdint.h>
 #include "work.h"