From b9a0e2d285b60187c7036a26981b05f4e139062c Mon Sep 17 00:00:00 2001 From: Brian Callahan Date: Tue, 26 Apr 2022 06:14:00 -0400 Subject: [PATCH] sokol: support compilation on OpenBSD (#14169) --- vlib/sokol/c/declaration.c.v | 3 +++ vlib/v/ast/cflags.v | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vlib/sokol/c/declaration.c.v b/vlib/sokol/c/declaration.c.v index fb5d1b85fa..74a40ed951 100644 --- a/vlib/sokol/c/declaration.c.v +++ b/vlib/sokol/c/declaration.c.v @@ -10,6 +10,7 @@ pub const ( #flag darwin -fobjc-arc #flag linux -lX11 -lGL -lXcursor -lXi -lpthread #flag freebsd -L/usr/local/lib -lX11 -lGL -lXcursor -lXi +#flag openbsd -L/usr/X11R6/lib -lX11 -lGL -lXcursor -lXi #flag windows -lgdi32 // METAL $if macos { @@ -27,6 +28,7 @@ $if ios { // OPENGL #flag linux -DSOKOL_GLCORE33 #flag freebsd -DSOKOL_GLCORE33 +#flag openbsd -DSOKOL_GLCORE33 //#flag darwin -framework OpenGL -framework Cocoa -framework QuartzCore // D3D #flag windows -DSOKOL_GLCORE33 @@ -41,6 +43,7 @@ $if ios { #flag windows -DSOKOL_NO_ENTRY #flag windows -DSOKOL_WIN32_FORCE_MAIN #flag freebsd -DSOKOL_NO_ENTRY +#flag openbsd -DSOKOL_NO_ENTRY #flag solaris -DSOKOL_NO_ENTRY // TODO end diff --git a/vlib/v/ast/cflags.v b/vlib/v/ast/cflags.v index 12fedd9815..4543cac0f8 100644 --- a/vlib/v/ast/cflags.v +++ b/vlib/v/ast/cflags.v @@ -25,7 +25,8 @@ pub fn (mut t Table) parse_cflag(cflg string, mod string, ctimedefines []string) return none } mut fos := '' - mut allowed_os_overrides := ['linux', 'darwin', 'freebsd', 'windows', 'mingw', 'solaris'] + mut allowed_os_overrides := ['linux', 'darwin', 'freebsd', 'openbsd', 'windows', 'mingw', + 'solaris'] allowed_os_overrides << ctimedefines for os_override in allowed_os_overrides { if !flag.starts_with(os_override) {