From 80485d29b2869ce67e3abecfbde275a3a4cc7a61 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 27 May 2020 22:26:40 -0400
Subject: [PATCH 1/5] Add slightly more strict compiler settings

Follows up on #355.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a4ac71b..4f46769 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ cava_SOURCES = cava.c config.c input/common.c input/fifo.c input/shmem.c \
 cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib
 cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
            -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L
-cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized 
+cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized -Werror
 
 if OSX
     cava_CFLAGS += -DNORT

From 022ea260e9ca3727a9a5da86d9d39cd097481542 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 27 May 2020 23:08:55 -0400
Subject: [PATCH 2/5] Suppress "unknown warning option"

(hopefully)
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4f46769..fef9458 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ cava_SOURCES = cava.c config.c input/common.c input/fifo.c input/shmem.c \
 cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib
 cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
            -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L
-cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized -Werror
+cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized
 
 if OSX
     cava_CFLAGS += -DNORT

From 71f937ad13413236e55da110746026d2548f4fe2 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 28 May 2020 18:20:37 -0400
Subject: [PATCH 3/5] Try fixing macos build issue

As per https://stackoverflow.com/questions/48042203/curses-library-doesnt-support-wide-char-on-os-x-high-sierra
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index fef9458..afd05d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
 cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized
 
 if OSX
-    cava_CFLAGS += -DNORT
+    cava_CFLAGS += -DNORT -D_XOPEN_SOURCE_EXTENDED
 else
     cava_LDFLAGS += -lrt
 endif

From e68c083991f604e1c22be2a27be78fcdf620e9cd Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 28 May 2020 18:25:16 -0400
Subject: [PATCH 4/5] Attempt 2 at fixing build issues

---
 Makefile.am               | 2 +-
 output/terminal_bcircle.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index afd05d2..fef9458 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
 cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized
 
 if OSX
-    cava_CFLAGS += -DNORT -D_XOPEN_SOURCE_EXTENDED
+    cava_CFLAGS += -DNORT
 else
     cava_LDFLAGS += -lrt
 endif
diff --git a/output/terminal_bcircle.c b/output/terminal_bcircle.c
index 90363cb..31799e6 100644
--- a/output/terminal_bcircle.c
+++ b/output/terminal_bcircle.c
@@ -1,5 +1,6 @@
 #include "output/terminal_bcircle.h"
 
+#define _XOPEN_SOURCE_EXTENDED
 #include <curses.h>
 #include <locale.h>
 #include <math.h>

From fd798c3160ecc96b7fb690ae3763ad508cd5e325 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 28 May 2020 18:29:49 -0400
Subject: [PATCH 5/5] Attempt 3

---
 Makefile.am               | 2 +-
 output/terminal_bcircle.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fef9458..83f2652 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
 cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized
 
 if OSX
-    cava_CFLAGS += -DNORT
+    cava_CFLAGS += -DNORT -Wno-implicit-function-declaration
 else
     cava_LDFLAGS += -lrt
 endif
diff --git a/output/terminal_bcircle.c b/output/terminal_bcircle.c
index 31799e6..90363cb 100644
--- a/output/terminal_bcircle.c
+++ b/output/terminal_bcircle.c
@@ -1,6 +1,5 @@
 #include "output/terminal_bcircle.h"
 
-#define _XOPEN_SOURCE_EXTENDED
 #include <curses.h>
 #include <locale.h>
 #include <math.h>