From 6a001c4840140e71ba1672a4576d52d1a62c0922 Mon Sep 17 00:00:00 2001 From: tylermurphy534 Date: Sat, 1 Oct 2022 14:35:16 -0400 Subject: rename src files, move .o to /bin --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3288181..adfd289 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,10 @@ LDFLAGS += -lalut LDFLAGS += -lvulkan LDFLAGS += $(INCFLAGS) +BIN = bin SRC = $(shell find src -name "*.cpp") SRC += $(shell find engine -name "*.cpp") -OBJ = $(SRC:.cpp=.o) -BIN = bin +OBJ = $(SRC:%.cpp=$(BIN)/%.o) VERTSRC = $(shell find ./res/shaders -type f -name "*.vert") VERTOBJ = $(patsubst %.vert, %.vert.spv, $(VERTSRC)) @@ -35,7 +35,8 @@ all: dirs shader build dirs: mkdir -p ./$(BIN) - + mkdir -p ./$(BIN)/src + mkdir -p ./$(BIN)/engine shader: $(VERTOBJ) $(FRAGOBJ) @@ -48,11 +49,10 @@ build: dirs shader ${OBJ} %.spv: % glslc -o $@ $< -%.o: %.cpp +$(BIN)/%.o: %.cpp $(CC) -o $@ -c $< $(CCFLAGS) clean: rm -rf app - rm -rf $(BIN) $(OBJ) - rm -rf res/shaders/*.spv - rm -rf lib/glfw/CMakeCache.txt + rm -rf $(BIN) + rm -rf res/shaders/*.spv \ No newline at end of file -- cgit v1.2.3-freya