diff options
| author | Ingo Bürk | 2018-07-15 21:47:26 +0200 |
|---|---|---|
| committer | GitHub | 2018-07-15 21:47:26 +0200 |
| commit | 1174bfa7dad3c830b415679b8c704e6d6e82f64b (patch) | |
| tree | ab0f1b0d18581788a0351e9db9a013afae34f9fb | |
| parent | Merge pull request #297 from Stunkymonkey/percent-first (diff) | |
| parent | Do not use pulseaudio for DragonFly BSD (diff) | |
Merge pull request #298 from tuxillo/patch-1
Do not use pulseaudio for DragonFly BSD
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/print_volume.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -85,6 +85,11 @@ OBJS:=$(filter-out src/pulse.o, $(OBJS)) LIBS:=$(filter-out -lpulse, $(LIBS)) endif +ifeq ($(OS),DragonFly) +OBJS:=$(filter-out src/pulse.o, $(OBJS)) +LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread +endif + src/%.o: src/%.c include/i3status.h $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< @echo " CC $<" diff --git a/src/print_volume.c b/src/print_volume.c index c5cf55b..4c0fbde 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -63,7 +63,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * free(instance); } -#ifndef __OpenBSD__ +#if !defined(__DragonFly__) && !defined(__OpenBSD__) /* Try PulseAudio first */ /* If the device name has the format "pulse[:N]" where N is the |