diff --git a/check_for_lsl b/check_for_lsl index 2dfab80d..76ce19f4 100755 --- a/check_for_lsl +++ b/check_for_lsl @@ -1,3 +1,6 @@ #!/bin/bash -echo 'int main(int,char**){return 0;}'|g++ -llsl -x c++ - 2>/dev/null && echo yes||echo no +if test `uname -s` = Darwin; then + LDFLAGS=-L/opt/homebrew/lib +fi +echo 'int main(int,char**){return 0;}'|g++ ${LDFLAGS} -llsl -x c++ - 2>/dev/null && echo yes||echo no rm -f a.out diff --git a/plugins/Makefile b/plugins/Makefile index e0c14d2d..e8928c36 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -62,8 +62,13 @@ CXXFLAGS += -DHAS_LSL TASCARMODS += lsljacktime lslactor levels2osc pos2lsl AUDIOPLUGINS += speechactivity periodogram TASCARMODSGUI += glabsensors waitforlslstream lsl2osc -GLABSENSORS += smiley eog emergency espheadtracker midicc \ - qualisys jackstatus serial oscthreshold +GLABSENSORS += smiley eog emergency espheadtracker \ + qualisys jackstatus + +ifeq ($(UNAME_S),Linux) +GLABSENSORS += midicc serial oscthreshold +endif + endif ifeq "$(HAS_OPENMHA)" "yes" @@ -184,7 +189,7 @@ build/$(PLUGINPREFIX)tascar_ap_%$(DLLEXT): src/tascar_ap_%.cc build/$(PLUGINPREFIX)tascar_mask_%$(DLLEXT): src/tascar_mask_%.cc $(CXX) -shared -o $@ $< $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) -build/$(PLUGINPREFIX)glabsensor_%$(DLLEXT): src/glabsensor_%.cc build/glabsensorplugin.o src/glabsensorplugin.h +build/$(PLUGINPREFIX)glabsensor_%$(DLLEXT): src/glabsensor_%.cc build/glabsensorplugin.o $(CXX) -shared -o $@ $^ $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) build/%_glade.h: src/%.glade