falso
/
zxuno-git
mirror of https://github.com/zxdos/zxuno.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from ivan-tat/master 

sdk: small hotfixes for Windows host
This commit is contained in:
Ivan Tatarinov 2021-06-09 14:31:15 +03:00 committed by GitHub
parent 569c9af9d0 37c0f00037
commit ebd32a3468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/common.mk
View File

@ -29,7 +29,7 @@ ifeq ($(OS),Windows_NT)
ZXSDK_PLATFORM = $(ZXSDK)/windows-x86
endif
else
ZXSDK_PLATFORM = $(ZXSDK)
ZXSDK_PLATFORM = $(ZXSDK)
endif
export ZXSDK_PLATFORM
@ -80,7 +80,7 @@ ZCCCFG = $(Z88DK)/lib/config
ifeq ($(OS),Windows_NT)
# Fix paths under Cygwin for Z88DK on Windows
ifeq ($(shell echo $$OSTYPE),cygwin)
ZCCCFG = $(shell cygpath -m $(ZCCCFG))
ZCCCFG := $(shell cygpath -m $(ZCCCFG))
endif
endif
export ZCCCFG

4
sdk/src/sdcc.inc.mk
View File

@ -99,10 +99,10 @@ install-sdcc: | sdcc/.extracted
for d in $(SDCC_SUBDIRS); do\
if [ $$d = bin ]; then\
find $$d -type f\
| awk '{print gensub(/^(.+)\/([^/]+)/, "$$(DEST)$$(prefix)/\\1/\\2: \\1/\\2 | $$(DEST)$$(prefix)/\\1\n\t$$(INSTALL_PROGRAM) -m 755 $$< $$@", "g")}';\
| sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL_PROGRAM) -m 755 $$< $$@,';\
else\
find $$d -type f\
| awk '{print gensub(/^(.+)\/([^/]+)/, "$$(DEST)$$(prefix)/\\1/\\2: \\1/\\2 | $$(DEST)$$(prefix)/\\1\n\t$$(INSTALL) -m 644 $$< $$@", "g")}';\
| sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL) -m 644 $$< $$@,';\
fi;\
done; } >install.mk;\
$(MAKE) -w -f install.mk DEST=$(DEST) prefix=$(prefix) INSTALL=$(INSTALL) INSTALL_PROGRAM=$(INSTALL_PROGRAM) install