From ec6c281d945cf01f3c5936b8fbe7362294f46ec5 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Tue, 24 Jul 2018 10:17:39 +0200 Subject: [PATCH] archive: Fix windows includes xcopy - need to specify (and create) the output directory e.g. to recursively copy directory 'foo' in 'tmp' unix: cp -r foo tmp win: md tmp\\foo & xcopy foo tmp\\foo --- makefiles/Makefile.cpp.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index cd164046d8..b5e834512c 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -557,16 +557,20 @@ ifeq ($(WINDOWS_ZLIB_DIR),$(OR_ROOT_FULL)\\dependencies\\install) $(COPY) dependencies$Sinstall$Sinclude$Szconf.h "$(DESTDIR)$(prefix)$Sinclude" endif ifeq ($(WINDOWS_GFLAGS_DIR),$(OR_ROOT_FULL)\\dependencies\\install) - $(COPYREC) dependencies$Sinstall$Sinclude$Sgflags "$(DESTDIR)$(prefix)$Sinclude" + $(MKDIR) "$(DESTDIR)$(prefix)$Sinclude$Sgflags" + $(COPYREC) dependencies$Sinstall$Sinclude$Sgflags "$(DESTDIR)$(prefix)$Sinclude$Sgflags" endif ifeq ($(WINDOWS_GLOG_DIR),$(OR_ROOT_FULL)\\dependencies\\install) - $(COPYREC) dependencies$Sinstall$Sinclude$Sglog "$(DESTDIR)$(prefix)$Sinclude" + $(MKDIR) "$(DESTDIR)$(prefix)$Sinclude$Sglog" + $(COPYREC) dependencies$Sinstall$Sinclude$Sglog "$(DESTDIR)$(prefix)$Sinclude$Sglog" endif ifeq ($(WINDOWS_PROTOBUF_DIR),$(OR_ROOT_FULL)\\dependencies\\install) - $(COPYREC) dependencies$Sinstall$Sinclude$Sgoogle "$(DESTDIR)$(prefix)$Sinclude" + $(MKDIR) "$(DESTDIR)$(prefix)$Sinclude$Sgoogle" + $(COPYREC) dependencies$Sinstall$Sinclude$Sgoogle "$(DESTDIR)$(prefix)$Sinclude$Sgoogle" endif ifeq ($(WINDOWS_CBC_DIR),$(OR_ROOT_FULL)\\dependencies\\install) - $(COPYREC) dependencies$Sinstall$Sinclude$Scoin "$(DESTDIR)$(prefix)$Sinclude" + $(MKDIR) "$(DESTDIR)$(prefix)$Sinclude$Scoin" + $(COPYREC) dependencies$Sinstall$Sinclude$Scoin "$(DESTDIR)$(prefix)$Sinclude$Scoin" endif install_doc: