summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-28 12:05:16 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-28 12:05:16 +0100
commit3c23827c96debe0c1313ce8e3b8ccc2fe9e1a05b (patch)
tree6676666b7f150c201467efd9f10d3c704684cdaa /makefile
parent06a4d861f88f7b47dc01b23d97093bff22d1d5a2 (diff)
made makefile executable without gnu tools (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/makefile b/makefile
index 67d8ec09854..715584712a0 100644
--- a/makefile
+++ b/makefile
@@ -754,7 +754,7 @@ ifeq (posix,$(SHELLTYPE))
COPY = $(SILENT) cp -fR "$(1)" "$(2)"
else
MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
- COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
+ COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" > 2> nul || exit 0
endif
GENDIR = $(BUILDDIR)/generated
@@ -1350,7 +1350,7 @@ generate: \
$(GENDIR)/includes/SDL2:
-$(call MKDIR,$@)
- $(SILENT)cp -fR 3rdparty/SDL2/include/* $(GENDIR)/includes/SDL2/.
+ -$(call COPY,3rdparty/SDL2/include,$(GENDIR)/includes/SDL2)
$(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/file2str.py | $(GEN_FOLDERS)
@echo Converting $<...