From 95b02cadf164edfd6ad93840f144c067d525bd44 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Thu, 20 Jun 2019 22:04:17 -0700 Subject: [PATCH] updated to support kvm on freebsd --- makefile | 4 +++- meshcore/KVM/Linux/linux_kvm.h | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index ca220a8..ff5c8c3 100644 --- a/makefile +++ b/makefile @@ -261,6 +261,7 @@ endif ifeq ($(ARCHID),30) ARCHNAME = freebsd_x86-64 CC = clang +CFLAGS += -I/usr/local/include KVM = 0 LMS = 0 endif @@ -282,6 +283,7 @@ CFLAGS += -D_LINKVM LINUXFLAGS = -l:lib-jpeg-turbo/linux/$(ARCHNAME)/libturbojpeg.a MACOSFLAGS = ./lib-jpeg-turbo/macos/$(ARCHNAME)/libturbojpeg.a endif + BSDFLAGS = /usr/local/lib/libjpeg.a endif ifeq ($(LMS),0) @@ -424,5 +426,5 @@ macos: $(STRIP) freebsd: - $(MAKE) EXENAME="$(EXENAME)_$(ARCHNAME)$(EXENAME2)" AID="$(ARCHID)" CFLAGS="-std=gnu99 -Wall -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_FREEBSD -D_NOHECI -D_NOILIBSTACKDEBUG -DMICROSTACK_PROXY -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(BSDSSL) -L. -lpthread -ldl -lz -lutil $(LDFLAGS) $(LDEXTRA)" + $(MAKE) EXENAME="$(EXENAME)_$(ARCHNAME)$(EXENAME2)" ADDITIONALSOURCES="$(LINUXKVMSOURCES)" AID="$(ARCHID)" CFLAGS="-std=gnu99 -Wall -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_FREEBSD -D_NOHECI -D_NOILIBSTACKDEBUG -DMICROSTACK_PROXY -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(BSDSSL) $(BSDFLAGS) -L. -lpthread -ldl -lz -lutil $(LDFLAGS) $(LDEXTRA)" $(STRIP) diff --git a/meshcore/KVM/Linux/linux_kvm.h b/meshcore/KVM/Linux/linux_kvm.h index 14d6a34..f032ab2 100644 --- a/meshcore/KVM/Linux/linux_kvm.h +++ b/meshcore/KVM/Linux/linux_kvm.h @@ -29,7 +29,10 @@ limitations under the License. #include #include #include -#include + +#ifndef _FREEBSD + #include +#endif #include "linux_tile.h" #include "linux_events.h"