diff --git a/Makefile b/Makefile index 56bb110..4be3d3a 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ $(OBJECTDIRS): $(BUILDDIR)/exile.o: submodules/exile.h/exile.c $(CC) -std=c99 -c submodules/exile.h/exile.c -o $@ -qswiki: $(WIKIOBJECTS) $(BUILDDIR)/exile.o $(RESOURCEOBJECTS) +qswiki: $(WIKIOBJECTS) $(BUILDDIR)/exile.o genresources $(CXX) $(shell shuf -e $(WIKIOBJECTS) $(RESOURCEOBJECTS) $(BUILDDIR)/exile.o ) ${LDFLAGS} ${INCLUDEFLAGS} -o $(BUILDDIR)/qswiki test: $(TESTOBJECTS) @@ -96,10 +96,10 @@ $(BUILDDIR)/embedded.o:embedded.cpp genresources clean: rm -r build -genresources: resources_gen.sh +genresources: resources_gen.sh resources ./resources_gen.sh $(GENERATED_PATH) $(RESOURCEDIR) -$(RESOURCEOUTDIR)/%.o: $(RESOURCEDIR)/% +$(RESOURCEOUTDIR)/%.o: $(RESOURCEDIR)/% .FORCE @mkdir -p $(dir $@) objcopy -I binary -O $(OBJCOPY_ARCH) -B $(OBJCOPY_TARGET) \ --rename-section .data=.rodata,alloc,load,readonly,data,contents \ @@ -110,5 +110,11 @@ $(RESOURCEOUTDIR)/%.o: $(RESOURCEDIR)/% .PHONY: resources resources: $(RESOURCEOBJECTS) +.PHONY: clean-resources +clean-resources: + rm -rf $(RESOURCEOUTDIR) + rm -rf $(GENERATED_PATH) +.PHONY: .FORCE +.FORCE: