makefile updated
This commit is contained in:
@@ -1,16 +1,22 @@
|
|||||||
CXX = g++
|
.PHONE: 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
|
||||||
|
|
||||||
all: viseq
|
SRCS := $(wildcard src/*.cpp)
|
||||||
|
OBJECTS := $(patsubst src/%.cpp,build/%.o, $(SRCS))
|
||||||
|
|
||||||
viseq:
|
|
||||||
|
viseq: $(OBJECTS)
|
||||||
|
$(CXX) $(OBJECTS) -o $@ $(LDFLAGS) $(LDLIBS)
|
||||||
|
|
||||||
|
$(OBJECTS): build/%.o : src/%.cpp
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd src; $(MAKE)
|
$(CXX) -c $< -o $@ $(CXXFLAGS) $(CXXINC)
|
||||||
$(CXX) $(wildcard build/*.o) -o viseq $(LDFLAGS) $(LDLIBS)
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f build/*
|
rm -f build/*
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
namespace VISEQ::APP{
|
namespace VISEQ::APP{
|
||||||
|
|
||||||
void State::pushEvent(InteractionEvent e){
|
void State::pushEvent(InteractionEvent e){
|
||||||
|
std::cout << "PUSHED" << std::endl;
|
||||||
event_queue.push_back(e);
|
event_queue.push_back(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user