From e5ea627259daae64ddbe67402b6d121e0143cd21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20=C3=85berg?= Date: Sun, 17 Feb 2019 15:34:09 +0100 Subject: [PATCH] FreeBSD glut fixups --- examples/Makefile.opengl | 7 ++++--- examples/parts/Makefile | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/Makefile.opengl b/examples/Makefile.opengl index acd89f9..700b45c 100644 --- 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 index 73de013..ba8bac6 100644 --- 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)) -- 2.39.5