Commit e5ea627259daae64ddbe67402b6d121e0143cd21
authorMartin Åberg <martin@fripost.org>
Sun, 17 Feb 2019 14:34:09 +0000 (15:34 +0100)
committerMartin Åberg <martin@fripost.org>
Sun, 17 Feb 2019 14:51:47 +0000 (15:51 +0100)
2 files changed:
examples/Makefile.opengl
examples/parts/Makefile

index acd89f9c78dd2eef77ca489c545fd1c9f1253b7c..700b45c9cff9f3d1dee1d9ae206445704acda6e2 100644 (file)
@@ -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
index 73de013f73f96ad662008bba3977b57b9bc1528f..ba8bac6c0606906522510bc3ee2176252c58b72f 100644 (file)
@@ -25,6 +25,7 @@ target := libsimavrparts
 all: obj ${target}
 
 include ${simavr}/Makefile.common
+include ../Makefile.opengl
 
 objects := $(patsubst %.c,${OBJ}/%.o, $(wildcard *.c))