From ddb762299464aa71081f7614a6ebca5a9c18b881 Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Mon, 20 Sep 2021 15:44:14 -0400
Subject: [PATCH] update makefiles to not always rebuild archive

---
 Makefile          | 5 ++---
 examples/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6fe9fe8..69bf5af 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,10 @@ CLEAN_ASSIMP_TARGET := $(MAKE) -C $(ASSIMP_DIR)/build clean
 endif
 
 
-all: mkdirs
+all: mkdirs $(LIBNAME)
 ifeq ($(USE_INTERNAL_ASSIMP), y)
 	$(MAKE) $(ASSIMP_LIB)
 endif
-	$(MAKE) $(LIBNAME)
 	$(MAKE) examples
 .PHONY: all
 
@@ -54,7 +53,7 @@ mkdirs:
 .PHONY: mkdirs
 
 $(LIBNAME): $(RENDER_OBJECTS)
-	ar -crs $(OBJDIR)/$(LIBNAME) $(RENDER_OBJECTS)
+	ar -crsuU $(OBJDIR)/$(LIBNAME) $(RENDER_OBJECTS)
 
 $(RENDER_OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -c -MMD $< -o $@
diff --git a/examples/Makefile b/examples/Makefile
index 3ae631c..5fbaee2 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -15,7 +15,7 @@ endif
 
 EXAMPLE_SOURCES = \
 	render_groups/main.cpp \
-	assimp_loading/main.cpp
+	#assimp_loading/main.cpp
 	#hello_world/main.cpp \
 	#simple_mesh/main.cpp
 EXAMPLE_OBJECTS = $(patsubst %/, $(OBJDIR)/%.o, $(dir $(EXAMPLE_SOURCES)))
@@ -24,7 +24,7 @@ all: mkdirs $(EXAMPLE_OBJECTS)
 
 -include $(OBJDIR)/*.d
 
-$(EXAMPLE_OBJECTS):
+$(EXAMPLE_OBJECTS): $(LIB)
 	$(CXX) $(CXXFLAGS) -c -MMD $(basename $(notdir $@))/main.cpp -o $@
 	$(CXX) -o $(BINDIR)/$(notdir $(basename $@)) $(LDFLAGS) $@ $(LIB) \
 		$(ASSIMP_LIB)