Skip to content
Snippets Groups Projects
Commit 337460d0 authored by chrfranke's avatar chrfranke
Browse files

Makefile.am: Update config-vc and *clean-vc targets for MSVC16/17.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5373 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 0f5fffd0
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,8 @@ $Id$ ...@@ -2,6 +2,8 @@ $Id$
2022-04-30 Christian Franke <franke@computer.org> 2022-04-30 Christian Franke <franke@computer.org>
Makefile.am: Update config-vc and *clean-vc targets for MSVC16/17.
os_win32/vc17: Copy from vc16 and change for MSVC17 (VS2022). os_win32/vc17: Copy from vc16 and change for MSVC17 (VS2022).
os_win32/vc16/*: Add configurations Debug-static and Release-static. os_win32/vc16/*: Add configurations Debug-static and Release-static.
......
...@@ -1050,19 +1050,19 @@ update-smart-drivedb.ps1: os_win32/update-smart-drivedb.ps1.in config.status ...@@ -1050,19 +1050,19 @@ update-smart-drivedb.ps1: os_win32/update-smart-drivedb.ps1.in config.status
$(SHELL) ./config.status --file=$@:$< $(SHELL) ./config.status --file=$@:$<
# MSVC Version to change in make command line # MSVC Version to change in make command line
vc = 16 vc = 17
vcver = $(vc) vcver = $(vc)
.PHONY: check-vc-version clean-vc config-vc distclean-vc maintainer-clean-vc .PHONY: check-vc-version clean-vc config-vc distclean-vc maintainer-clean-vc
check-vc-version: check-vc-version:
@case '$(vcver)' in \ @case '$(vcver)' in \
14|15|16) test -d '$(srcdir)/os_win32/vc$(vcver)' || \ 16|17) test -d '$(srcdir)/os_win32/vc$(vcver)' || \
{ echo '$(srcdir)/os_win32/vc$(vcver): Not found (not included in src tarball)' >&2; exit 1; } ;; \ { echo '$(srcdir)/os_win32/vc$(vcver): Not found (not included in src tarball)' >&2; exit 1; } ;; \
*) echo 'Usage: $(MAKE) vc=14|15|16 config-vc clean-vc distclean-vc maintainer-clean-vc'; exit 1 ;; \ *) echo 'Usage: $(MAKE) vc=16|17 config-vc clean-vc distclean-vc maintainer-clean-vc'; exit 1 ;; \
esac esac
# Build os_win32/vcNN/{config.h,smart*.rc,svnversion.h} for MSVC14/15/16 from MinGW files # Build os_win32/vcNN/{config.h,smart*.rc,svnversion.h} for MSVCNN from MinGW files
CONFIG_VC_FILES = \ CONFIG_VC_FILES = \
$(srcdir)/os_win32/vc$(vcver)/config.h \ $(srcdir)/os_win32/vc$(vcver)/config.h \
...@@ -1086,16 +1086,15 @@ $(srcdir)/os_win32/vc$(vcver)/smartctl_res.rc: smartctl_res.rc ...@@ -1086,16 +1086,15 @@ $(srcdir)/os_win32/vc$(vcver)/smartctl_res.rc: smartctl_res.rc
$(srcdir)/os_win32/vc$(vcver)/smartd_res.rc: smartd_res.rc $(srcdir)/os_win32/vc$(vcver)/smartd_res.rc: smartd_res.rc
sed '/^1 24 /d' $< > $@ sed '/^1 24 /d' $< > $@
# VC14: smartmontools.VC.*, VC15/16: .vs/smartmontools/vNN/*
clean-vc: check-vc-version clean-vc: check-vc-version
rm -f $(srcdir)/os_win32/vc$(vcver)/smartmontools.VC.VC.opendb
rm -f $(srcdir)/os_win32/vc$(vcver)/smartmontools.VC.db
rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/Browse.VC.opendb rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/Browse.VC.opendb
rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/*.VC.db* rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/*.VC.db*
rm -rf $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/ipch rm -rf $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/ipch
rm -f $(srcdir)/os_win32/vc$(vcver)/syslogevt.h rm -f $(srcdir)/os_win32/vc$(vcver)/syslogevt.h
rm -rf $(srcdir)/os_win32/vc$(vcver)/Debug rm -rf $(srcdir)/os_win32/vc$(vcver)/Debug
rm -rf $(srcdir)/os_win32/vc$(vcver)/Debug-static
rm -rf $(srcdir)/os_win32/vc$(vcver)/Release rm -rf $(srcdir)/os_win32/vc$(vcver)/Release
rm -rf $(srcdir)/os_win32/vc$(vcver)/Release-static
rm -rf $(srcdir)/os_win32/vc$(vcver)/x64 rm -rf $(srcdir)/os_win32/vc$(vcver)/x64
distclean-vc: clean-vc distclean-vc: clean-vc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment