From 220117cf1a8088b0a8fa245d6b2cbf79f4a85d1e Mon Sep 17 00:00:00 2001 From: jaby Date: Tue, 23 Aug 2022 20:05:53 +0200 Subject: [PATCH] Copy library instead of building it directly --- lib/Makefile | 5 ----- src/Library/Makefile | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 6b2de056..f64e9557 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -79,11 +79,6 @@ $(OUTPUT_DIR)/%.o: $$(subst !super,..,%.s) @mkdir -p $(dir $@) $(CC) $(ARCHFLAGS) -I$(PCSX_REDUX) -g -c -o $@ $< -#Linking rule -$(TARGET).a: $(OBJS) - @mkdir -p $(dir $@) - $(AR) rcs $(TARGET).a $(OBJS) - $(TARGET).elf: $(OBJS) $(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) $(LIBS_all) $(LIBS) diff --git a/src/Library/Makefile b/src/Library/Makefile index cfad36fe..2ca1b9dd 100644 --- a/src/Library/Makefile +++ b/src/Library/Makefile @@ -1,13 +1,24 @@ ARTIFACT = libJabyEngine -BUILD_DIR = ../../lib +BUILD_DIR = bin include ../../lib/Wildcard.mk SRCS = $(call rwildcard, src, c cpp) include ../../lib/Makefile +LIB_DIR = ../../lib/$(CONFIG_NAME) + +#Linking rule +$(TARGET).a: $(OBJS) + @mkdir -p $(dir $@) + $(AR) rcs $(TARGET).a $(OBJS) + +$(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a + @mkdir -p $(LIB_DIR) + cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a #Rules section for default compilation and linking -all: $(TARGET).a +all: $(LIB_DIR)/$(ARTIFACT).a clean: - rm -fr $(OUTPUT_DIR) \ No newline at end of file + rm -fr $(OUTPUT_DIR) + rm -fr $(LIB_DIR)/$(ARTIFACT).a \ No newline at end of file