merge conflict stuff

Makefile

@@ -1,16 +1,23 @@
-CXX = g++
+.PHONY: all clean
 
-LDLIBS = -lraylib -lasound -llibremidi -pthread 
+CXX := g++
-LDFLAGS = -Llib -L/usr/lib -L/usr/local/lib
+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:
+viseq: $(OBJECTS)
-	mkdir -p build
+	@mkdir -p build
-	cd src; $(MAKE)
+	$(CXX) $(LDFLAGS) $(LDLIBS) -o viseq $^
-	$(CXX) $(wildcard build/*.o) -o viseq $(LDFLAGS) $(LDLIBS)
+
+build/%.o: src/%.cpp
+	$(CXX) $(CXXFLAGS) $(CXXINC) -c $< -o $@ 
 
 clean:
 	rm -f build/*

src/Makefile

@@ -1,40 +0,0 @@
-CXX = g++
-CXXFLAGS = -std=c++23 -Wall -g -fno-omit-frame-pointer -gdwarf-4 -Og -Wnarrowing -DLIBREMIDI_ALSA=1 -DLIBREMIDI_HEADER_ONLY=1
-CXXINC = -I../include -isysteminclude
-
-obj_files = main.o app-manager.o graph-manager.o signal-manager.o interaction-manager.o ui.o node.o midi-node.o config-node.o modifier-node.o midi.o signal.o canvas.o state.o edge.o
-
-
-all: $(obj_files) 
-	
-$(obj_files): %.o : %.cpp
-	$(CXX) -c $^ -o ../build/$@ $(CXXFLAGS) $(CXXINC)
-
-#all: viseq
-
-#viseq: main.o app-manager.o graph-manager.o signal-manager.o interaction-manager.o ui.o node.o midi-node.o config-node.o modifier-node.o midi.o signal.o canvas.o state.o edge.o
-#	$(CXX) ${wildcard build/*.o} -o viseq $(LDFLAGS) $(LDLIBS)
-
-#main.o:
-#	$(CXX) -c src/main.cpp -o ../build/main.o $(CXXFLAGS) $(CXXINC)
-#
-#app-manager.o:
-#	$(CXX) -c src/app-manager.cpp -o ../build/app-manager.o $(CXXFLAGS) $(CXXINC)
-
-
-
-#src/canvas.cpp
-#src/signal.cpp
-#src/midi.cpp
-#src/node.cpp
-#src/graph-manager.cpp
-#src/modifier-node.cpp
-#src/config-node.cpp
-#src/midi-node.cpp
-#src/ui.cpp
-#src/state.cpp
-#src/edge.cpp
-#src/interaction-manager.cpp
-#src/signal-manager.cpp
-#src/app-manager.cpp
-#src/main.cpp

src/interaction-manager.cpp

@@ -11,6 +11,7 @@
 #include <memory>
 
 namespace VISEQ::INTERACTION{
+
     void InteractionManager::update(){
         if(KEYS_DOWN.ctrl && IsKeyPressed(KEY_C)){
             VEC_SPTR_Node selected_nodes = gm->getCopiesOfSelectedNodes();

src/ui.cpp

@@ -17,7 +17,7 @@ namespace VISEQ::APP::UI{
 
     void AppUI::drawSideBar(){
 
-        GuiPanel((Rectangle){-1,-30,380,(float)state->settings.height + 31}, "");
+        GuiPanel((Rectangle){-1,-30,280,(float)state->settings.height + 31}, "");
         const int s_controls = 25;
         //GuiSetStyle(BUTTON, STATE_FOCUSED, 0xFF0000FF);
         if(GuiButton((Rectangle){20, (float)s_controls, 80, 30}, "PLAY")) sm->play ? sm->pause() : sm->start();