From d2634ce9c51839d993e9e14d199eebf809f4d850 Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Tue, 26 May 2015 10:20:10 -0400 Subject: [PATCH] gl: darwin/arm64 support Conflicts with cl/10396. I'll submit this first and update the it. Change-Id: Ibc873b3fe896ecd2415a42676614807788a8d1c6 Reviewed-on: https://go-review.googlesource.com/10399 Reviewed-by: Hyang-Ah Hana Kim --- gl/gendebug.go | 2 +- gl/gl.go | 2 +- gl/gldebug.go | 2 +- gl/types_common.go | 6 ++++-- gl/types_prod.go | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gl/gendebug.go b/gl/gendebug.go index 9c68b78..501d080 100644 --- a/gl/gendebug.go +++ b/gl/gendebug.go @@ -232,7 +232,7 @@ package gl #ifdef os_linux #include #endif -#ifdef os_darwin_arm +#ifdef os_ios #include #endif #ifdef os_darwin_amd64 diff --git a/gl/gl.go b/gl/gl.go index 9ec6e5d..cf73708 100644 --- a/gl/gl.go +++ b/gl/gl.go @@ -20,7 +20,7 @@ package gl #ifdef os_linux #include #endif -#ifdef os_darwin_arm +#ifdef os_ios #include #endif #ifdef os_darwin_amd64 diff --git a/gl/gldebug.go b/gl/gldebug.go index 4840a64..81815e4 100644 --- a/gl/gldebug.go +++ b/gl/gldebug.go @@ -16,7 +16,7 @@ package gl #ifdef os_linux #include #endif -#ifdef os_darwin_arm +#ifdef os_ios #include #endif #ifdef os_darwin_amd64 diff --git a/gl/types_common.go b/gl/types_common.go index d88fb90..55dc4ad 100644 --- a/gl/types_common.go +++ b/gl/types_common.go @@ -12,16 +12,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 darwin,amd64 CFLAGS: -Dos_darwin_amd64 -#cgo darwin,arm CFLAGS: -Dos_darwin_arm +#cgo darwin,arm CFLAGS: -Dos_ios +#cgo darwin,arm64 CFLAGS: -Dos_ios #cgo linux CFLAGS: -Dos_linux #ifdef os_linux #include #endif -#ifdef os_darwin_arm +#ifdef os_ios #include #endif #ifdef os_darwin_amd64 diff --git a/gl/types_prod.go b/gl/types_prod.go index 770d3e7..3c8f044 100644 --- a/gl/types_prod.go +++ b/gl/types_prod.go @@ -11,7 +11,7 @@ package gl #ifdef os_linux #include #endif -#ifdef os_darwin_arm +#ifdef os_ios #include #endif #ifdef os_darwin_amd64