From 773a75b9487c095ed907a6448e2fcd4417cb162c Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 22 Sep 2014 21:51:55 -0400 Subject: [PATCH] update makefile checks --- cfg/checks/av.mk | 2 +- cfg/checks/desktop_notifications.mk | 2 +- cfg/checks/sound_notifications.mk | 2 +- cfg/checks/x11.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/checks/av.mk b/cfg/checks/av.mk index 6de1ce9..54d93ed 100644 --- a/cfg/checks/av.mk +++ b/cfg/checks/av.mk @@ -1,6 +1,6 @@ # Variables for audio call support AUDIO_LIBS = libtoxav openal -AUDIO_CFLAGS = -D_AUDIO +AUDIO_CFLAGS = -DAUDIO ifneq (, $(findstring device.o, $(OBJ))) AUDIO_OBJ = audio_call.o else diff --git a/cfg/checks/desktop_notifications.mk b/cfg/checks/desktop_notifications.mk index 4c805bd..7901207 100644 --- a/cfg/checks/desktop_notifications.mk +++ b/cfg/checks/desktop_notifications.mk @@ -1,6 +1,6 @@ # Variables for desktop notifications support DESK_NOTIFY_LIBS = libnotify -DESK_NOTIFY_CFLAGS = -D_BOX_NOTIFY +DESK_NOTIFY_CFLAGS = -DBOX_NOTIFY # Check if we can build desktop notifications support CHECK_DESK_NOTIFY_LIBS = $(shell pkg-config --exists $(DESK_NOTIFY_LIBS) || echo -n "error") diff --git a/cfg/checks/sound_notifications.mk b/cfg/checks/sound_notifications.mk index 2db026b..1413651 100644 --- a/cfg/checks/sound_notifications.mk +++ b/cfg/checks/sound_notifications.mk @@ -1,6 +1,6 @@ # Variables for sound notifications support SND_NOTIFY_LIBS = openal freealut -SND_NOTIFY_CFLAGS = -D_SOUND_NOTIFY +SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY ifneq (, $(findstring device.o, $(OBJ))) SND_NOTIFY_OBJ = else diff --git a/cfg/checks/x11.mk b/cfg/checks/x11.mk index 2cee978..fd952ac 100644 --- a/cfg/checks/x11.mk +++ b/cfg/checks/x11.mk @@ -1,6 +1,6 @@ # Variables for X11 support X11_LIBS = x11 -X11_CFLAGS = -D_X11 +X11_CFLAGS = -DX11 # Check if we can build X11 support CHECK_X11_LIBS = $(shell pkg-config --exists $(X11_LIBS) || echo -n "error")