From ceacc6efa18a029ef245d4ea3ef5d5bd3c0a53a0 Mon Sep 17 00:00:00 2001 From: Kate M Date: Sat, 24 Feb 2024 18:38:26 -0500 Subject: [PATCH] Fixed an issue where earlier versions of Make did not like my Makefile --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e63c70ef8c396..26dca0008fc76 100644 --- a/Makefile +++ b/Makefile @@ -1069,18 +1069,18 @@ $(ODIR)/%.inc: $(SRC_DIR)/%.cpp includes: $(OBJS:.o=.inc) +make -C tests includes -$(ODIR)/%.o: $(SRC_DIR)/%.cpp $(PCH_P) - $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) -MMD -MP $(PCHFLAGS) -c $< -o $@ - -$(ODIR)/%.o: $(SRC_DIR)/%.rc - $(RC) $(RFLAGS) $< -o $@ - $(ODIR)/third-party/imgui/%.o: $(IMGUI_DIR)/%.cpp $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) -w -MMD -MP -c $< -o $@ $(ODIR)/third-party/imtui/%.o: $(IMTUI_DIR)/%.cpp $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) -w -MMD -MP -c $< -o $@ +$(ODIR)/%.o: $(SRC_DIR)/%.cpp $(PCH_P) + $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) -MMD -MP $(PCHFLAGS) -c $< -o $@ + +$(ODIR)/%.o: $(SRC_DIR)/%.rc + $(RC) $(RFLAGS) $< -o $@ + $(ODIR)/resource.o: data/cataicon.ico data/application_manifest.xml src/version.h: version