Merge pull request #320 from endofexclusive/pr/freebsd-misc

Make simavr build on Freebsd
buserror · Feb 25, 2019 · d08f42a · d08f42a
2 parents 719f4fd + 082939e
commit d08f42a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/examples/Makefile.opengl b/examples/Makefile.opengl
@@ -11,12 +11,13 @@ else
 ifeq (${shell uname -o}, Msys)
 LDFLAGS 	+= -mwindows -lopengl32 -lfreeglut
 else
-CPPFLAGS	+= ${shell pkg-config --cflags glu glut} -DFREEBSD=1
-LDFLAGS 	+= ${shell pkg-config --libs glu glut}
+CPPFLAGS	+= ${shell pkg-config --cflags glu}
+LDFLAGS 	+= ${shell pkg-config --libs glu} -lglut
 endif
 endif
 endif
 
 ifeq  (${UNAME}, FreeBSD)
-CPPFLAGS	+= -DFREEBSD=1 -DNO_ALLOCA=1
+CPPFLAGS	+= -DNO_ALLOCA=1
+CPPFLAGS	+= -I/usr/local/include
 endif
diff --git a/examples/parts/Makefile b/examples/parts/Makefile
@@ -25,6 +25,7 @@ target := libsimavrparts
 all: obj ${target}
 
 include ${simavr}/Makefile.common
+include ../Makefile.opengl
 
 objects := $(patsubst %.c,${OBJ}/%.o, $(wildcard *.c))
 

diff --git a/examples/parts/uart_pty.c b/examples/parts/uart_pty.c
@@ -29,6 +29,11 @@
 #include <signal.h>
 #ifdef __APPLE__
 #include <util.h>
+#elif defined (__FreeBSD__)
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <termios.h>
+#include <libutil.h>
 #else
 #include <pty.h>
 #endif

diff --git a/simavr/sim/sim_avr.c b/simavr/sim/sim_avr.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/time.h>
 #include "sim_avr.h"
 #include "sim_core.h"
 #include "sim_time.h"