diff --git a/.gitignore b/.gitignore
index 05165e5..cfe00e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ __pycache__/
 
 .tags
 .tags_sorted_by_file
+
+.idea/*
diff --git a/include/Button.h b/include/Button.h
index 15e155b..ace3d98 100644
--- a/include/Button.h
+++ b/include/Button.h
@@ -26,6 +26,11 @@
 extern "C" {
 #endif
 
+
+/**
+ * No button mask
+ */
+#define BUTTON_MASK_NONE  0x00
 /**
  * Fire button mask.
  */
diff --git a/make/Base.mk b/make/Base.mk
index 261e01d..473fdce 100644
--- a/make/Base.mk
+++ b/make/Base.mk
@@ -87,12 +87,18 @@ INCDIRS := -I$(NUVOSDK)/CMSIS/Include \
 
 LDSCRIPT := $(EVICSDK)/linker/linker.ld
 
+ifeq ($(shell uname),Darwin)
+LIBDIRS := -L$(ARMGCC)/arm-none-eabi/lib \
+	-L$(ARMGCC)/lib/gcc/arm-none-eabi/$(shell arm-none-eabi-gcc -dumpversion) \
+	-L$(EVICSDK)/lib
+else
 LIBDIRS := -L$(ARMGCC)/arm-none-eabi/lib \
 	-L$(ARMGCC)/arm-none-eabi/newlib \
 	-L$(ARMGCC)/lib/arm-none-eabi/newlib \
 	-L$(ARMGCC)/gcc/arm-none-eabi/$(GCC_VERSION) \
 	-L$(ARMGCC)/lib/gcc/arm-none-eabi/$(GCC_VERSION) \
 	-L$(EVICSDK)/lib
+endif
 
 CFLAGS += -Wall -mcpu=$(CPU) -mthumb -Os -fdata-sections -ffunction-sections
 CFLAGS += $(INCDIRS)