diff options
author | 2020-09-27 12:41:14 +0200 | |
---|---|---|
committer | 2020-09-27 20:41:14 +1000 | |
commit | e996e148f38b9603e634517128cd0a4d5eb4eb94 (patch) | |
tree | 4716fc7c8309a8da8facf22e31edd88a6b709c9b | |
parent | a1d35e5abf431e03e06d55b96379a3b14753ed4d (diff) |
FreeBSD fixes (#7295)
* psixptty: Fix for FreeBSD
We need to check for __FreeBSD__ not __FreeBSD_kernel__
* FreeBSD: Use gl includes from pkg-config
FreeBSD doesn't install the includes from 3rdparty software in a default
location so use pkg-config to get the correct path.
* FreeBSD: genieos is named simple bsd
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 6 | ||||
-rw-r--r-- | src/osd/modules/file/posixptty.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -196,7 +196,7 @@ GENIEOS := solaris endif ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD) OS := freebsd -GENIEOS := freebsd +GENIEOS := bsd endif ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD) OS := freebsd diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index b3fc924eab4..5056334b79e 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1390,6 +1390,12 @@ end end end + if _OPTIONS["targetos"]=="freebsd" then + buildoptions { + backtick(pkgconfigcmd() .. " --cflags gl") + } + end + defines { "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp index 5b38acc750a..5ecb37057ad 100644 --- a/src/osd/modules/file/posixptty.cpp +++ b/src/osd/modules/file/posixptty.cpp @@ -19,7 +19,7 @@ #include <unistd.h> #include <cstdlib> -#if defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__DragonFly__) #include <termios.h> #include <libutil.h> #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) |