From 300468735d7605d1b059457c710b2997a848d2b4 Mon Sep 17 00:00:00 2001 From: nash169 <bernardo.fichera@gmail.com> Date: Sat, 19 Nov 2016 16:49:57 +0100 Subject: [PATCH] Modify viewevents_LDADD and add viewevents_LDFLAGS If DARWIN is true OPENGL and GLUT variables contain links against the appropriate frameworks for macOS. --- utils/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/utils/Makefile.am b/utils/Makefile.am index a6ac958..4e7b9ca 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -8,6 +8,14 @@ EXTRA_PROGRAMS = eventsource eventsink eventselect \ eventgenerator eventcounter eventlogger \ contsink messagesource viewevents +if DARWIN +OPENGL = -framework OpenGL +GLUT = -framework GLUT +else +OPENGL = -lGL +GLUT = -lGLU +endif + MUSIC_INCLUDE = -I$(top_srcdir)/src -I$(top_builddir)/src music_SOURCES = music.cc @@ -48,7 +56,7 @@ MUSIC_INCLUDE = -I$(top_srcdir)/src -I$(top_builddir)/src viewevents_SOURCES = viewevents.cpp VisualiseNeurons.cpp VisualiseNeurons.h viewevents_CXXFLAGS = $(MUSIC_INCLUDE) @MPI_CXXFLAGS@ - viewevents_LDADD = $(top_builddir)/src/libmusic.la @MPI_LDFLAGS@ -lglut -lGL -lGLU -lpthread - + viewevents_LDADD = $(top_builddir)/src/libmusic.la @MPI_LDFLAGS@ -lglut -lpthread + viewevents_LDFLAGS = $(OPENGL) $(GLUT) MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -- GitLab