diff --git a/raylib/cgo_darwin.go b/raylib/cgo_darwin.go
index 4fb9c48..b27de45 100644
--- a/raylib/cgo_darwin.go
+++ b/raylib/cgo_darwin.go
@@ -23,9 +23,11 @@ package rl
 #include "external/glfw/src/egl_context.c"
 #include "external/glfw/src/osmesa_context.c"
 
-#cgo darwin LDFLAGS: -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework CoreFoundation
+#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,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
diff --git a/raylib/cgo_freebsd.go b/raylib/cgo_freebsd.go
index 3f0c1a4..48b24b9 100644
--- a/raylib/cgo_freebsd.go
+++ b/raylib/cgo_freebsd.go
@@ -36,8 +36,10 @@ package rl
 #cgo freebsd CFLAGS: -I. -I/usr/local/include -Iexternal/glfw/include -DPLATFORM_DESKTOP
 #cgo freebsd LDFLAGS: -L/usr/local/lib
 
-#cgo freebsd,!wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lX11
-#cgo freebsd,wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
+#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,!wayland CFLAGS: -D_GLFW_X11
 #cgo freebsd,wayland CFLAGS: -D_GLFW_WAYLAND
diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go
index 7edbbe2..669e008 100644
--- a/raylib/cgo_linux.go
+++ b/raylib/cgo_linux.go
@@ -35,8 +35,10 @@ package rl
 
 #cgo linux CFLAGS: -Iexternal/glfw/include -DPLATFORM_DESKTOP -Wno-stringop-overflow
 
-#cgo linux,!wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lX11
-#cgo linux,wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
+#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,!wayland CFLAGS: -D_GLFW_X11
 #cgo linux,wayland CFLAGS: -D_GLFW_WAYLAND
diff --git a/raylib/cgo_openbsd.go b/raylib/cgo_openbsd.go
index 7b6bdaa..f406e83 100644
--- a/raylib/cgo_openbsd.go
+++ b/raylib/cgo_openbsd.go
@@ -36,8 +36,10 @@ package rl
 #cgo openbsd CFLAGS: -I. -I/usr/X11R6/include -Iexternal/glfw/include -DPLATFORM_DESKTOP
 #cgo openbsd LDFLAGS: -L/usr/X11R6/lib
 
-#cgo openbsd,!wayland LDFLAGS: -lGL -lm -pthread -lX11
-#cgo openbsd,wayland LDFLAGS: -lGL -lm -pthread -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
+#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,!wayland CFLAGS: -D_GLFW_X11
 #cgo openbsd,wayland CFLAGS: -D_GLFW_WAYLAND
diff --git a/raylib/cgo_windows.go b/raylib/cgo_windows.go
index 73d6273..fcd2f8b 100644
--- a/raylib/cgo_windows.go
+++ b/raylib/cgo_windows.go
@@ -23,9 +23,11 @@ package rl
 #include "external/glfw/src/egl_context.c"
 #include "external/glfw/src/osmesa_context.c"
 
-#cgo windows LDFLAGS: -lopengl32 -lgdi32 -lwinmm -lole32
+#cgo windows LDFLAGS: -lgdi32 -lwinmm -lole32
 #cgo windows CFLAGS: -D_GLFW_WIN32 -Iexternal -Iexternal/glfw/include -Iexternal/glfw/deps/mingw -DPLATFORM_DESKTOP
 
+#cgo windows,!angle 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