From 5886052228528347c6e844d18e812d2870a6c5f6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 4 May 2026 14:21:48 +0200 Subject: [PATCH] makefile updated --- Makefile | 24 +++++++++++++++--------- src/Makefile | 40 ---------------------------------------- src/state.cpp | 1 + 3 files changed, 16 insertions(+), 49 deletions(-) delete mode 100644 src/Makefile diff --git a/Makefile b/Makefile index a639f4a..c770a86 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,22 @@ -CXX = g++ +.PHONE: 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 -all: viseq - -viseq: +SRCS := $(wildcard src/*.cpp) +OBJECTS := $(patsubst src/%.cpp,build/%.o, $(SRCS)) + + +viseq: $(OBJECTS) + $(CXX) $(OBJECTS) -o $@ $(LDFLAGS) $(LDLIBS) + +$(OBJECTS): build/%.o : src/%.cpp mkdir -p build - cd src; $(MAKE) - $(CXX) $(wildcard build/*.o) -o viseq $(LDFLAGS) $(LDLIBS) + $(CXX) -c $< -o $@ $(CXXFLAGS) $(CXXINC) clean: rm -f build/* diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index ba078b7..0000000 --- a/src/Makefile +++ /dev/null @@ -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 diff --git a/src/state.cpp b/src/state.cpp index 2fb8393..6a09051 100644 --- a/src/state.cpp +++ b/src/state.cpp @@ -8,6 +8,7 @@ namespace VISEQ::APP{ void State::pushEvent(InteractionEvent e){ + std::cout << "PUSHED" << std::endl; event_queue.push_back(e); }