From 6ad59d9c427f37225ded14ed1ddc40ceac941ee1 Mon Sep 17 00:00:00 2001 From: Lily <78098021+ilylily@users.noreply.github.com> Date: Sat, 23 Oct 2021 06:31:09 -0900 Subject: [PATCH] v3.3/glfw: add openbsd support (#336) partially fixes #288 --- v3.3/glfw/build.go | 8 +++++--- v3.3/glfw/{c_glfw_freebsd.go => c_glfw_bsd.go} | 2 +- v3.3/glfw/native_linbsd.go | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename v3.3/glfw/{c_glfw_freebsd.go => c_glfw_bsd.go} (97%) diff --git a/v3.3/glfw/build.go b/v3.3/glfw/build.go index b60c631d..3a48706a 100644 --- a/v3.3/glfw/build.go +++ b/v3.3/glfw/build.go @@ -38,16 +38,18 @@ package glfw #cgo linux,!wayland LDFLAGS: -lX11 -lXrandr -lXxf86vm -lXi -lXcursor -lm -lXinerama -ldl -lrt #cgo linux,wayland LDFLAGS: -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon -lm -ldl -lrt -// FreeBSD Build Tags +// BSD Build Tags // ---------------- // GLFW Options: #cgo freebsd pkg-config: glfw3 -#cgo freebsd CFLAGS: -D_GLFW_HAS_DLOPEN -#cgo freebsd,!wayland CFLAGS: -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESSARB +#cgo openbsd pkg-config: x11 xau xcb xdmcp +#cgo freebsd openbsd CFLAGS: -D_GLFW_HAS_DLOPEN +#cgo freebsd,!wayland openbsd CFLAGS: -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESSARB #cgo freebsd,wayland CFLAGS: -D_GLFW_WAYLAND // Linker Options: #cgo freebsd,!wayland LDFLAGS: -lm -lGL -lX11 -lXrandr -lXxf86vm -lXi -lXcursor -lXinerama #cgo freebsd,wayland LDFLAGS: -lm -lGL -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon +#cgo openbsd LDFLAGS: -lm */ import "C" diff --git a/v3.3/glfw/c_glfw_freebsd.go b/v3.3/glfw/c_glfw_bsd.go similarity index 97% rename from v3.3/glfw/c_glfw_freebsd.go rename to v3.3/glfw/c_glfw_bsd.go index 01122739..668848a3 100644 --- a/v3.3/glfw/c_glfw_freebsd.go +++ b/v3.3/glfw/c_glfw_bsd.go @@ -1,4 +1,4 @@ -// +build freebsd +// +build freebsd openbsd package glfw diff --git a/v3.3/glfw/native_linbsd.go b/v3.3/glfw/native_linbsd.go index 39d9f0c9..ac3bbc79 100644 --- a/v3.3/glfw/native_linbsd.go +++ b/v3.3/glfw/native_linbsd.go @@ -1,4 +1,4 @@ -// +build linux,!wayland freebsd,!wayland +// +build linux,!wayland freebsd,!wayland openbsd package glfw