git.y1.nz

commit 07b5f07163bbbd500c583887f8386ecdc6cdb0b5
parent 208fb0f62d6040b590ac1afef50003d7fbf68cd4
Author: Toxa <56631470+untoxa@users.noreply.github.com>
Date:   Tue, 17 Nov 2020 16:51:16 +0300

Merge pull request #88 from jserv/simplify-build-rules

Improve the rules to install SDCC executables
Diffstat:
M
Makefile
34
+++++++++++++++-------------------

1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
@@ -171,28 +171,24 @@ gbdk-lib-examples-makefile:
 	$(MAKE) -C $(BUILDDIR)/examples/gb make.bat
 	unix2dos $(BUILDDIR)/examples/gb/make.bat
 
-#SDDC copy
-sdcc-install: check-SDCCDIR
-	@echo Installing SDCC
+# Copy SDDC executable files
+SDCC_BINS = as2gbmap makebin packihx sdar sdasgb sdcc sdcdb sdcdb sdcpp sdldgb sdnm sdobjcopy sdranlib sz80
 ifeq ($(OS),Windows_NT)
-		@cp -r $(SDCCDIR)/bin $(BUILDDIR)
-else
-#		@cp $(SDCCDIR)/bin/{as2gbmap,makebin,packihx,sdar,sdasgb,sdcc,sdcdb,sdcdb{,src}.el,sdcpp,sdldgb,sdnm,sdobjcopy,sdranlib,sz80} $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/as2gbmap $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/makebin $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/packihx $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdar $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdasgb $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdcc $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdcdb $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdcpp $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdldgb $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdnm $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdobjcopy $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sdranlib $(BUILDDIR)/bin/
-		@cp $(SDCCDIR)/bin/sz80 $(BUILDDIR)/bin/
+MINGW64_RUNTIME = \
+	libgcc_s_seh-1.dll \
+	libgcc_s_sjlj-1.dll \
+	libstdc++-6.dll \
+	libwinpthread-1.dll \
+	readline5.dll
+SDCC_BINS := $(addsuffix .exe, $(SDCC_BINS)) $(MINGW64_RUNTIME)
 endif
 
+sdcc-install: check-SDCCDIR
+	@echo Installing SDCC
+	@for i in $(SDCC_BINS); do \
+	cp $(SDCCDIR)/bin/$$i $(BUILDDIR)/bin/ && echo "-> $$i" ; \
+	done
+
 # Final binary
 binary:
 ifeq ($(ARCHIVETYPE),zip)

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.