Skip to content

Commit 5579029

Browse files
committed
all: add -DGLES_SILENCE_DEPRECATION instead of #define
Defining GLES_SILENCE_DEPRECATION did not take any effects. Use -D instead. Change-Id: I9c0602b38d39020b9539fdb8030fef3a7b366929 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/374499 Run-TryBot: Hajime Hoshi <hajimehoshi@gmail.com> Trust: Hajime Hoshi <hajimehoshi@gmail.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
1 parent cde37c6 commit 5579029

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

app/darwin_ios.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package app
99

1010
/*
11-
#cgo CFLAGS: -x objective-c -DGL_SILENCE_DEPRECATION
11+
#cgo CFLAGS: -x objective-c -DGL_SILENCE_DEPRECATION -DGLES_SILENCE_DEPRECATION
1212
#cgo LDFLAGS: -framework Foundation -framework UIKit -framework GLKit -framework OpenGLES -framework QuartzCore
1313
#include <sys/utsname.h>
1414
#include <stdint.h>

app/darwin_ios.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include <stdio.h>
1111
#include <sys/utsname.h>
1212

13-
#define GLES_SILENCE_DEPRECATION
14-
1513
#import <UIKit/UIKit.h>
1614
#import <GLKit/GLKit.h>
1715

gl/work.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package gl
1616
#cgo android CFLAGS: -Dos_android
1717
#cgo ios CFLAGS: -Dos_ios
1818
#cgo darwin,!ios CFLAGS: -Dos_macos
19-
#cgo darwin CFLAGS: -DGL_SILENCE_DEPRECATION
19+
#cgo darwin CFLAGS: -DGL_SILENCE_DEPRECATION -DGLES_SILENCE_DEPRECATION
2020
#cgo linux CFLAGS: -Dos_linux
2121
#cgo openbsd CFLAGS: -Dos_openbsd
2222

gl/work.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#endif
1616

1717
#ifdef os_ios
18-
#define GLES_SILENCE_DEPRECATION
1918
#include <OpenGLES/ES2/glext.h>
2019
#endif
2120

0 commit comments

Comments
 (0)