From ee7efd060ea8f391857cd3254c18663423e4abf2 Mon Sep 17 00:00:00 2001 From: cinnaboot Date: Sun, 7 Mar 2021 16:38:28 -0500 Subject: [PATCH] add assimp target as depndency for examples --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bbd84a8..55d0d05 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ ifeq ($(USE_INTERNAL_ASSIMP), y) CXXFLAGS += -I$(ASSIMP_DIR)/include ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a BUILD_ASSIMP_TARGET := build_assimp +CLEAN_ASSIMP_TARGET := $(MAKE) -C $(ASSIMP_DIR)/build clean endif @@ -55,11 +56,12 @@ $(LIBNAME): $(RENDER_OBJECTS) $(RENDER_OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) $(CXXFLAGS) -c -MMD $< -o $@ -examples: $(LIBNAME) +examples: $(LIBNAME) $(BUILD_ASSIMP_TARGET) ASSIMP_DIR=$(ASSIMP_DIR) $(MAKE) -C $(EXAMPLEDIR) .PHONY: examples clean: rm -rf $(OBJDIR)/* $(MAKE) clean -C $(EXAMPLEDIR) + $(CLEAN_ASSIMP_TARGET) .PHONY: clean