diff --git a/audio/al/al.go b/audio/al/al.go index 0a54aebf..e7ed2604 100644 --- a/audio/al/al.go +++ b/audio/al/al.go @@ -9,11 +9,13 @@ package al // #cgo darwin,amd64 CFLAGS: -DGO_DARWIN -I/usr/local/opt/openal-soft/include/AL -I/usr/include/AL // #cgo darwin,arm64 CFLAGS: -DGO_DARWIN -I/opt/homebrew/opt/openal-soft/include/AL // #cgo freebsd CFLAGS: -DGO_FREEBSD -I/usr/local/include/AL +// #cgo openbsd CFLAGS: -DGO_OPENBSD -I/usr/local/include/AL // #cgo linux CFLAGS: -DGO_LINUX -I/usr/include/AL // #cgo windows CFLAGS: -DGO_WINDOWS -I${SRCDIR}/../windows/openal-soft-1.18.2/include/AL // #cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/openal-soft/lib -lopenal // #cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/openal-soft/lib -lopenal // #cgo freebsd LDFLAGS: -L/usr/local/lib -lopenal +// #cgo openbsd LDFLAGS: -L/usr/local/lib -lopenal // #cgo linux LDFLAGS: -lopenal // #cgo windows LDFLAGS: -L${SRCDIR}/../windows/bin -lOpenAL32 // #include diff --git a/audio/ov/vorbisfile.go b/audio/ov/vorbisfile.go index ec7f9c4b..4372cfd0 100644 --- a/audio/ov/vorbisfile.go +++ b/audio/ov/vorbisfile.go @@ -9,11 +9,13 @@ package ov // #cgo darwin,amd64 CFLAGS: -DGO_DARWIN -I/usr/include/vorbis -I/usr/local/include/vorbis // #cgo darwin,arm64 CFLAGS: -DGO_DARWIN -I/opt/homebrew/include -I/opt/homebrew/include/vorbis // #cgo freebsd CFLAGS: -DGO_FREEBSD -I/usr/include/vorbis -I/usr/local/include/vorbis +// #cgo openbsd CFLAGS: -DGO_OPENBSD -I/usr/local/include/vorbis -I/usr/local/include // #cgo linux CFLAGS: -DGO_LINUX -I/usr/include/vorbis // #cgo windows CFLAGS: -DGO_WINDOWS -I${SRCDIR}/../windows/libvorbis-1.3.5/include/vorbis -I${SRCDIR}/../windows/libogg-1.3.3/include // #cgo darwin,amd64 LDFLAGS: -L/usr/lib -L/usr/local/lib -lvorbisfile // #cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/lib -lvorbisfile // #cgo freebsd LDFLAGS: -L/usr/lib -L/usr/local/lib -lvorbisfile +// #cgo openbsd LDFLAGS: -L/usr/local/lib -lvorbisfile // #cgo linux LDFLAGS: -lvorbisfile // #cgo windows LDFLAGS: -L${SRCDIR}/../windows/bin -llibvorbisfile // #include diff --git a/audio/vorbis/vorbis.go b/audio/vorbis/vorbis.go index 5523e893..d284aeca 100644 --- a/audio/vorbis/vorbis.go +++ b/audio/vorbis/vorbis.go @@ -9,11 +9,13 @@ package vorbis // #cgo darwin,amd64 CFLAGS: -DGO_DARWIN -I/usr/include/vorbis -I/usr/local/include/vorbis // #cgo darwin,arm64 CFLAGS: -DGO_DARWIN -I/opt/homebrew/include -I/opt/homebrew/include/vorbis // #cgo freebsd CFLAGS: -DGO_FREEBSD -I/usr/local/include/vorbis +// #cgo openbsd CFLAGS: -DGO_OPENBSD -I/usr/local/include/vorbis -I/usr/local/include // #cgo linux CFLAGS: -DGO_LINUX -I/usr/include/vorbis // #cgo windows CFLAGS: -DGO_WINDOWS -I${SRCDIR}/../windows/libvorbis-1.3.5/include/vorbis -I${SRCDIR}/../windows/libogg-1.3.3/include // #cgo darwin,amd64 LDFLAGS: -L/usr/lib -L/usr/local/lib -lvorbis // #cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/lib -lvorbis // #cgo freebsd LDFLAGS: -L/usr/local/lib -lvorbis +// #cgo openbsd LDFLAGS: -L/usr/local/lib -lvorbis // #cgo linux LDFLAGS: -lvorbis // #cgo windows LDFLAGS: -L${SRCDIR}/../windows/bin -llibvorbis // #include "codec.h" diff --git a/gls/build.go b/gls/build.go index b1c12eac..b1c5145d 100644 --- a/gls/build.go +++ b/gls/build.go @@ -11,6 +11,9 @@ package gls // #cgo freebsd CFLAGS: -DGL_GLEXT_PROTOTYPES // #cgo freebsd LDFLAGS: // +// #cgo openbsd CFLAGS: -DGL_GLEXT_PROTOTYPES -I/usr/X11R6/include +// #cgo openbsd LDFLAGS: -L/usr/X11R6/lib -lGL +// // #cgo linux CFLAGS: -DGL_GLEXT_PROTOTYPES // #cgo linux LDFLAGS: -ldl // diff --git a/gls/glapi.c b/gls/glapi.c index 7816f9af..d79dbe11 100644 --- a/gls/glapi.c +++ b/gls/glapi.c @@ -92,7 +92,7 @@ static PFNGLXGETPROCADDRESSPROC glx_get_proc_address; // open_libgl opens the OpenGL shared object for Linux/Freebsd static int open_libgl(void) { - libgl = dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL); + libgl = dlopen("libGL.so", RTLD_LAZY | RTLD_GLOBAL); if (libgl == NULL) { return -1; } diff --git a/go.mod b/go.mod index 8cf55fca..9d9676d6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/g3n/engine go 1.13 require ( - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210410170116-ea3d685f79fb + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index dd7d1c6a..17731f81 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210410170116-ea3d685f79fb h1:T6gaWBvRzJjuOrdCtg8fXXjKai2xSDqWTcKFUPuw8Tw= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210410170116-ea3d685f79fb/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 h1:RkGhqHxEVAvPM0/R+8g7XRwQnHatO0KAuVcwHo8q9W8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728/go.mod h1:SyRD8YfuKk+ZXlDqYiqe1qMSqjNgtHzBTG810KUagMc= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9 h1:D0iM1dTCbD5Dg1CbuvLC/v/agLc79efSj/L35Q3Vqhs=