From e3d8d6dd12c04498018d7260872054a03ee24f3c Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Tue, 7 Nov 2023 14:06:19 +0100 Subject: [PATCH] Rename angle to es2 --- README.md | 2 +- raylib/cgo_darwin.go | 12 ++++++------ raylib/cgo_darwin_sdl.go | 12 ++++++------ raylib/cgo_freebsd.go | 12 ++++++------ raylib/cgo_freebsd_sdl.go | 12 ++++++------ raylib/cgo_linux.go | 12 ++++++------ raylib/cgo_linux_sdl.go | 14 +++++++------- raylib/cgo_openbsd.go | 12 ++++++------ raylib/cgo_openbsd_sdl.go | 12 ++++++------ raylib/cgo_windows.go | 12 ++++++------ raylib/cgo_windows_sdl.go | 12 ++++++------ 11 files changed, 62 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index a1da2cb..24cdb12 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ You can also build binary in [MSYS2](https://msys2.github.io/) shell. * `opengl43` - uses OpenGL 4.3 backend * `opengl21` - uses OpenGL 2.1 backend (default is 3.3 on desktop) * `opengl11` - uses OpenGL 1.1 backend (pseudo OpenGL 1.1 style) -* `angle` - uses OpenGL ES 2.0 backend (can be used to link against [Google's ANGLE](https://github.com/google/angle)) +* `es2` - uses OpenGL ES 2.0 backend (can be used to link against [Google's ANGLE](https://github.com/google/angle)) ### Documentation diff --git a/raylib/cgo_darwin.go b/raylib/cgo_darwin.go index cdcbf44..2f63991 100644 --- a/raylib/cgo_darwin.go +++ b/raylib/cgo_darwin.go @@ -26,12 +26,12 @@ package rl #cgo darwin LDFLAGS: -framework Cocoa -framework IOKit -framework CoreVideo -framework CoreFoundation #cgo darwin CFLAGS: -x objective-c -Iexternal/glfw/include -D_GLFW_COCOA -D_GLFW_USE_CHDIR -D_GLFW_USE_MENUBAR -D_GLFW_USE_RETINA -Wno-deprecated-declarations -Wno-implicit-const-int-float-conversion -DPLATFORM_DESKTOP -#cgo darwin,!angle LDFLAGS: -framework OpenGL +#cgo darwin,!es2 LDFLAGS: -framework OpenGL -#cgo darwin,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo darwin,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo darwin,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo darwin,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo darwin,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo darwin,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo darwin,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo darwin,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo darwin,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo darwin,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_darwin_sdl.go b/raylib/cgo_darwin_sdl.go index 4151bdc..9bf05da 100644 --- a/raylib/cgo_darwin_sdl.go +++ b/raylib/cgo_darwin_sdl.go @@ -8,12 +8,12 @@ package rl #cgo darwin CFLAGS: -x objective-c -Wno-deprecated-declarations -Wno-implicit-const-int-float-conversion -DPLATFORM_DESKTOP_SDL #cgo darwin pkg-config: sdl2 -#cgo darwin,!angle LDFLAGS: -framework OpenGL +#cgo darwin,!es2 LDFLAGS: -framework OpenGL -#cgo darwin,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo darwin,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo darwin,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo darwin,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo darwin,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo darwin,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo darwin,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo darwin,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo darwin,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo darwin,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_freebsd.go b/raylib/cgo_freebsd.go index 243468a..9c4d2eb 100644 --- a/raylib/cgo_freebsd.go +++ b/raylib/cgo_freebsd.go @@ -39,15 +39,15 @@ package rl #cgo freebsd,!wayland LDFLAGS: -lm -pthread -ldl -lrt -lX11 #cgo freebsd,wayland LDFLAGS: -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon -#cgo freebsd,!angle LDFLAGS: -lGL +#cgo freebsd,!es2 LDFLAGS: -lGL #cgo freebsd,!wayland CFLAGS: -D_GLFW_X11 #cgo freebsd,wayland CFLAGS: -D_GLFW_WAYLAND -#cgo freebsd,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo freebsd,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo freebsd,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo freebsd,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo freebsd,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo freebsd,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo freebsd,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo freebsd,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo freebsd,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo freebsd,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_freebsd_sdl.go b/raylib/cgo_freebsd_sdl.go index 096d65f..2451924 100644 --- a/raylib/cgo_freebsd_sdl.go +++ b/raylib/cgo_freebsd_sdl.go @@ -9,12 +9,12 @@ package rl #cgo freebsd pkg-config: sdl2 -#cgo freebsd,!angle LDFLAGS: -lGL +#cgo freebsd,!es2 LDFLAGS: -lGL -#cgo freebsd,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo freebsd,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo freebsd,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo freebsd,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo freebsd,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo freebsd,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo freebsd,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo freebsd,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo freebsd,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo freebsd,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go index 543736b..94d2058 100644 --- a/raylib/cgo_linux.go +++ b/raylib/cgo_linux.go @@ -38,15 +38,15 @@ package rl #cgo linux,!wayland LDFLAGS: -lm -pthread -ldl -lrt -lX11 #cgo linux,wayland LDFLAGS: -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon -#cgo linux,!angle LDFLAGS: -lGL +#cgo linux,!es2 LDFLAGS: -lGL #cgo linux,!wayland CFLAGS: -D_GLFW_X11 #cgo linux,wayland CFLAGS: -D_GLFW_WAYLAND -#cgo linux,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo linux,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo linux,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo linux,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo linux,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo linux,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo linux,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo linux,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo linux,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo linux,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_linux_sdl.go b/raylib/cgo_linux_sdl.go index 3b6bdcf..a90eb5b 100644 --- a/raylib/cgo_linux_sdl.go +++ b/raylib/cgo_linux_sdl.go @@ -4,16 +4,16 @@ package rl /* -#cgo linux,!angle LDFLAGS: -lm +#cgo linux,!es2 LDFLAGS: -lm #cgo linux CFLAGS: -DPLATFORM_DESKTOP_SDL -Wno-stringop-overflow #cgo linux pkg-config: sdl2 -#cgo linux,!angle LDFLAGS: -lGL +#cgo linux,!es2 LDFLAGS: -lGL -#cgo linux,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo linux,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo linux,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo linux,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo linux,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo linux,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo linux,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo linux,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo linux,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo linux,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_openbsd.go b/raylib/cgo_openbsd.go index 0a9bc6c..7f3655a 100644 --- a/raylib/cgo_openbsd.go +++ b/raylib/cgo_openbsd.go @@ -39,15 +39,15 @@ package rl #cgo openbsd,!wayland LDFLAGS: -lm -pthread -lX11 #cgo openbsd,wayland LDFLAGS: -lm -pthread -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon -#cgo openbsd,!angle LDFLAGS: -lGL +#cgo openbsd,!es2 LDFLAGS: -lGL #cgo openbsd,!wayland CFLAGS: -D_GLFW_X11 #cgo openbsd,wayland CFLAGS: -D_GLFW_WAYLAND -#cgo openbsd,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo openbsd,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo openbsd,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo openbsd,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo openbsd,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo openbsd,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo openbsd,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo openbsd,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo openbsd,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo openbsd,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_openbsd_sdl.go b/raylib/cgo_openbsd_sdl.go index bd67ae1..829d394 100644 --- a/raylib/cgo_openbsd_sdl.go +++ b/raylib/cgo_openbsd_sdl.go @@ -9,12 +9,12 @@ package rl #cgo openbsd pkg-config: sdl2 -#cgo openbsd,!angle LDFLAGS: -lGL +#cgo openbsd,!es2 LDFLAGS: -lGL -#cgo openbsd,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo openbsd,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo openbsd,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo openbsd,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo openbsd,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo openbsd,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo openbsd,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo openbsd,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo openbsd,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo openbsd,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_windows.go b/raylib/cgo_windows.go index 300cfdd..9962de2 100644 --- a/raylib/cgo_windows.go +++ b/raylib/cgo_windows.go @@ -26,12 +26,12 @@ package rl #cgo windows LDFLAGS: -lgdi32 -lwinmm -lole32 #cgo windows CFLAGS: -D_GLFW_WIN32 -Iexternal -Iexternal/glfw/include -Iexternal/glfw/deps/mingw -DPLATFORM_DESKTOP -Wno-stringop-overflow -#cgo windows,!angle LDFLAGS: -lopengl32 +#cgo windows,!es2 LDFLAGS: -lopengl32 -#cgo windows,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo windows,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo windows,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo windows,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo windows,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo windows,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo windows,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo windows,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo windows,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo windows,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C" diff --git a/raylib/cgo_windows_sdl.go b/raylib/cgo_windows_sdl.go index fe55c72..e2f68a4 100644 --- a/raylib/cgo_windows_sdl.go +++ b/raylib/cgo_windows_sdl.go @@ -7,12 +7,12 @@ package rl #cgo windows LDFLAGS: -lgdi32 -lwinmm -lole32 -lSDL2 #cgo windows CFLAGS: -Iexternal -DPLATFORM_DESKTOP_SDL -Wno-stringop-overflow -#cgo windows,!angle LDFLAGS: -lopengl32 +#cgo windows,!es2 LDFLAGS: -lopengl32 -#cgo windows,opengl11,!angle CFLAGS: -DGRAPHICS_API_OPENGL_11 -#cgo windows,opengl21,!angle CFLAGS: -DGRAPHICS_API_OPENGL_21 -#cgo windows,opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_43 -#cgo windows,!opengl11,!opengl21,!opengl43,!angle CFLAGS: -DGRAPHICS_API_OPENGL_33 -#cgo windows,angle CFLAGS: -DGRAPHICS_API_OPENGL_ES2 +#cgo windows,opengl11,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_11 +#cgo windows,opengl21,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_21 +#cgo windows,opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_43 +#cgo windows,!opengl11,!opengl21,!opengl43,!es2 CFLAGS: -DGRAPHICS_API_OPENGL_33 +#cgo windows,es2 CFLAGS: -DGRAPHICS_API_OPENGL_ES2 */ import "C"