From edf8718cca4b2b7d1e0eb794587a2b1b983668bf Mon Sep 17 00:00:00 2001
From: Noah Metz <noah@metznet.ca>
Date: Wed, 16 Oct 2024 15:28:42 -0600
Subject: [PATCH] Removed homebrew paths from makefile

---
 client/Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index c441595..6c5d856 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -11,31 +11,28 @@ SPV_FILES = $(VERT_SPV) $(FRAG_SPV) $(COMP_SPV)
 
 EXTRA_DEBUG_REQUIREMENTS :=
 UNAME_S := $(shell uname -s)
-OS :=
 ifeq ($(UNAME_S),Linux)
-	CC = clang
-	CPP = clang++
-	GDB = GDB
+	GDB = gdb
 endif
 ifeq ($(UNAME_S),Darwin)
-	LDFLAGS += -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -L/opt/homebrew/lib
-	CC = /opt/homebrew/opt/llvm/bin/clang
-	CPP = /opt/homebrew/opt/llvm/bin/clang++
-	DSYM = /opt/homebrew/opt/llvm/bin/dsymutil
-	GDB = /opt/homebrew/opt/llvm/bin/lldb
+	DSYM = dsymutil
+	GDB = lldb
 	EXTRA_DEBUG_REQUIREMENTS = roleplay.dSYM
 endif
 
+CC ?= clang
+CXX ?= clang++
+
 export MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=1
 
 .PHONY: all
 all: roleplay $(SPV_FILES)
 
 roleplay: $(OBJECTS)
-	$(CPP) $(CFLAGS) $(LDFLAGS) -o $@ $^
+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^
 
 %.o: %.cpp
-	$(CPP) $(CFLAGS) -Wno-nullability-completeness -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-private-field -Wno-unused-variable -c -o $@ $<
+	$(CXX) $(CFLAGS) -std=c++14 -Wno-nullability-completeness -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-private-field -Wno-unused-variable -c -o $@ $<
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<