git.y1.nz

commit 0deca17c17229fd8716e49f1ffb0aba3d99ff803
parent 742ba6ddcfc2831c240fbb424f70ff205d76cd25
Author: Toxa <56631470+untoxa@users.noreply.github.com>
Date:   Sun, 20 Dec 2020 17:15:57 +0300

Merge pull request #109 from bbbbbr/develop_windows_path_fix

Makefile: Fix SDCCDIR bin copy on Windows for issue #103, remove unused as2gbmap
Diffstat:
M
Makefile
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -182,7 +182,7 @@ gbdk-lib-examples-makefile:
 	unix2dos $(BUILDDIR)/examples/gb/make.bat
 
 # Copy SDDC executable files
-SDCC_BINS = as2gbmap makebin packihx sdar sdasgb sdcc sdcdb sdcdb sdcpp sdldgb sdnm sdobjcopy sdranlib sz80
+SDCC_BINS = makebin packihx sdar sdasgb sdcc sdcdb sdcdb sdcpp sdldgb sdnm sdobjcopy sdranlib sz80
 ifeq ($(OS),Windows_NT)
 MINGW64_RUNTIME = \
 	libgcc_s_seh-1.dll \
@@ -214,10 +214,15 @@ install: native-build
 	mkdir -p $(TARGETDIR)
 	cp -r $(BUILDDIR)/* $(TARGETDIR)
 
+# Make sure SDCCDIR is populated
+# Swap WIN/MSDOS slashes to Unix style for MinGW (prevent some errors with cp)
 check-SDCCDIR:
 ifndef SDCCDIR
 	$(error SDCCDIR is undefined)
 endif
+ifeq ($(OS),Windows_NT)
+SDCCDIR := $(subst \,/,$(SDCCDIR))
+endif
 
 # First purge doxygen output directory to clear potentially stale output.
 # Next change working dir so "include" is the root doxygen works in.
@@ -233,3 +238,4 @@ endif
 
 doxygen-clean:
 	rm -rf $(GBDKDOCSDIR)/api
+

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