merge conflict stuff

Makefile

@@ -1,16 +1,23 @@
-CXX = g++
+.PHONY: all clean
 
-LDLIBS = -lraylib -lasound -llibremidi -pthread 
-LDFLAGS = -Llib -L/usr/lib -L/usr/local/lib
+CXX := g++
+CXXFLAGS = -std=c++23 -Wall -g -fno-omit-frame-pointer -gdwarf-4 -Og -Wnarrowing -DLIBREMIDI_ALSA=1 -DLIBREMIDI_HEADER_ONLY=1
+CXXINC := -Iinclude -isysteminclude
 
-hdr_files = $(wildcard src/*.h)
+LDLIBS := -lraylib -lasound -llibremidi -pthread 
+LDFLAGS := -Llib -L/usr/lib -L/usr/local/lib
+
+SOURCES := $(wildcard src/*.cpp)
+OBJECTS := $(SOURCES:src%.cpp=build%.o)
 
 all: viseq
 	
-viseq:
-	mkdir -p build
-	cd src; $(MAKE)
-	$(CXX) $(wildcard build/*.o) -o viseq $(LDFLAGS) $(LDLIBS)
+viseq: $(OBJECTS)
+	@mkdir -p build
+	$(CXX) $(LDFLAGS) $(LDLIBS) -o viseq $^
+
+build/%.o: src/%.cpp
+	$(CXX) $(CXXFLAGS) $(CXXINC) -c $< -o $@ 
 
 clean:
 	rm -f build/*