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 <hyangah@gmail.com>
This commit is contained in:
parent
730f563fbc
commit
d2634ce9c5
@ -232,7 +232,7 @@ package gl
|
||||
#ifdef os_linux
|
||||
#include <GLES2/gl2.h>
|
||||
#endif
|
||||
#ifdef os_darwin_arm
|
||||
#ifdef os_ios
|
||||
#include <OpenGLES/ES2/gl.h>
|
||||
#endif
|
||||
#ifdef os_darwin_amd64
|
||||
|
2
gl/gl.go
2
gl/gl.go
@ -20,7 +20,7 @@ package gl
|
||||
#ifdef os_linux
|
||||
#include <GLES2/gl2.h>
|
||||
#endif
|
||||
#ifdef os_darwin_arm
|
||||
#ifdef os_ios
|
||||
#include <OpenGLES/ES2/glext.h>
|
||||
#endif
|
||||
#ifdef os_darwin_amd64
|
||||
|
@ -16,7 +16,7 @@ package gl
|
||||
#ifdef os_linux
|
||||
#include <GLES2/gl2.h>
|
||||
#endif
|
||||
#ifdef os_darwin_arm
|
||||
#ifdef os_ios
|
||||
#include <OpenGLES/ES2/gl.h>
|
||||
#endif
|
||||
#ifdef os_darwin_amd64
|
||||
|
@ -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 <GLES2/gl2.h>
|
||||
#endif
|
||||
#ifdef os_darwin_arm
|
||||
#ifdef os_ios
|
||||
#include <OpenGLES/ES2/gl.h>
|
||||
#endif
|
||||
#ifdef os_darwin_amd64
|
||||
|
@ -11,7 +11,7 @@ package gl
|
||||
#ifdef os_linux
|
||||
#include <GLES2/gl2.h>
|
||||
#endif
|
||||
#ifdef os_darwin_arm
|
||||
#ifdef os_ios
|
||||
#include <OpenGLES/ES2/gl.h>
|
||||
#endif
|
||||
#ifdef os_darwin_amd64
|
||||
|
Loading…
x
Reference in New Issue
Block a user