From f7376547bf6b1fefb9a1d6fdcc737cf82cfdfb0a Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Sun, 13 Feb 2022 16:58:04 -0500 Subject: projects: Update VC version names for VS2017, VS2022 - Rename VC15 -> VC14.10, VC17 -> VC14.30. The projects directory that holds the pre-generated Visual Studio project files uses VC to indicate the MSVC version. At some point support for Visual Studio 2017 (Visual Studio version 15 which uses MSVC 14.10) was added as VC15. Visual Studio 2022 (Visual Studio version 17 which uses MSVC 14.30) project files were recently added and followed that same format using VC17. There is no such MSVC version (yet) as VC15 or VC17. For VS 2017 for example, the name we use is correct as either VS17, VS2017, VC14.10. I opted for the latter since we use VC for earlier versions (eg VC10, VC12, etc). Ref: https://github.com/curl/curl/pull/8438#issuecomment-1037070192 Closes https://github.com/curl/curl/pull/8447 --- Makefile.am | 124 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b85b81f48..67b046c7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,56 +77,56 @@ VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc -VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl -VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist -VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc -VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl -VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist -VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc - -VC17_LIBTMPL = projects/Windows/VC17/lib/libcurl.tmpl -VC17_LIBVCXPROJ = projects/Windows/VC17/lib/libcurl.vcxproj.dist -VC17_LIBVCXPROJ_DEPS = $(VC17_LIBTMPL) Makefile.am lib/Makefile.inc -VC17_SRCTMPL = projects/Windows/VC17/src/curl.tmpl -VC17_SRCVCXPROJ = projects/Windows/VC17/src/curl.vcxproj.dist -VC17_SRCVCXPROJ_DEPS = $(VC17_SRCTMPL) Makefile.am src/Makefile.inc - -VC_DIST = projects/README \ - projects/build-openssl.bat \ - projects/build-wolfssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC10/curl-all.sln \ - projects/Windows/VC10/lib/libcurl.sln \ - projects/Windows/VC10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC10/src/curl.sln \ - projects/Windows/VC10/src/curl.vcxproj.filters \ - projects/Windows/VC11/curl-all.sln \ - projects/Windows/VC11/lib/libcurl.sln \ - projects/Windows/VC11/lib/libcurl.vcxproj.filters \ - projects/Windows/VC11/src/curl.sln \ - projects/Windows/VC11/src/curl.vcxproj.filters \ - projects/Windows/VC12/curl-all.sln \ - projects/Windows/VC12/lib/libcurl.sln \ - projects/Windows/VC12/lib/libcurl.vcxproj.filters \ - projects/Windows/VC12/src/curl.sln \ - projects/Windows/VC12/src/curl.vcxproj.filters \ - projects/Windows/VC14/curl-all.sln \ - projects/Windows/VC14/lib/libcurl.sln \ - projects/Windows/VC14/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14/src/curl.sln \ - projects/Windows/VC14/src/curl.vcxproj.filters \ - projects/Windows/VC15/curl-all.sln \ - projects/Windows/VC15/lib/libcurl.sln \ - projects/Windows/VC15/lib/libcurl.vcxproj.filters \ - projects/Windows/VC15/src/curl.sln \ - projects/Windows/VC15/src/curl.vcxproj.filters \ - projects/Windows/VC17/curl-all.sln \ - projects/Windows/VC17/lib/libcurl.sln \ - projects/Windows/VC17/lib/libcurl.vcxproj.filters \ - projects/Windows/VC17/src/curl.sln \ - projects/Windows/VC17/src/curl.vcxproj.filters \ - projects/generate.bat \ - projects/wolfssl_options.h \ +VC14_10_LIBTMPL = projects/Windows/VC14.10/lib/libcurl.tmpl +VC14_10_LIBVCXPROJ = projects/Windows/VC14.10/lib/libcurl.vcxproj.dist +VC14_10_LIBVCXPROJ_DEPS = $(VC14_10_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_10_SRCTMPL = projects/Windows/VC14.10/src/curl.tmpl +VC14_10_SRCVCXPROJ = projects/Windows/VC14.10/src/curl.vcxproj.dist +VC14_10_SRCVCXPROJ_DEPS = $(VC14_10_SRCTMPL) Makefile.am src/Makefile.inc + +VC14_30_LIBTMPL = projects/Windows/VC14.30/lib/libcurl.tmpl +VC14_30_LIBVCXPROJ = projects/Windows/VC14.30/lib/libcurl.vcxproj.dist +VC14_30_LIBVCXPROJ_DEPS = $(VC14_30_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_30_SRCTMPL = projects/Windows/VC14.30/src/curl.tmpl +VC14_30_SRCVCXPROJ = projects/Windows/VC14.30/src/curl.vcxproj.dist +VC14_30_SRCVCXPROJ_DEPS = $(VC14_30_SRCTMPL) Makefile.am src/Makefile.inc + +VC_DIST = projects/README \ + projects/build-openssl.bat \ + projects/build-wolfssl.bat \ + projects/checksrc.bat \ + projects/Windows/VC10/curl-all.sln \ + projects/Windows/VC10/lib/libcurl.sln \ + projects/Windows/VC10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC10/src/curl.sln \ + projects/Windows/VC10/src/curl.vcxproj.filters \ + projects/Windows/VC11/curl-all.sln \ + projects/Windows/VC11/lib/libcurl.sln \ + projects/Windows/VC11/lib/libcurl.vcxproj.filters \ + projects/Windows/VC11/src/curl.sln \ + projects/Windows/VC11/src/curl.vcxproj.filters \ + projects/Windows/VC12/curl-all.sln \ + projects/Windows/VC12/lib/libcurl.sln \ + projects/Windows/VC12/lib/libcurl.vcxproj.filters \ + projects/Windows/VC12/src/curl.sln \ + projects/Windows/VC12/src/curl.vcxproj.filters \ + projects/Windows/VC14/curl-all.sln \ + projects/Windows/VC14/lib/libcurl.sln \ + projects/Windows/VC14/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14/src/curl.sln \ + projects/Windows/VC14/src/curl.vcxproj.filters \ + projects/Windows/VC14.10/curl-all.sln \ + projects/Windows/VC14.10/lib/libcurl.sln \ + projects/Windows/VC14.10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.10/src/curl.sln \ + projects/Windows/VC14.10/src/curl.vcxproj.filters \ + projects/Windows/VC14.30/curl-all.sln \ + projects/Windows/VC14.30/lib/libcurl.sln \ + projects/Windows/VC14.30/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.30/src/curl.sln \ + projects/Windows/VC14.30/src/curl.vcxproj.filters \ + projects/generate.bat \ + projects/wolfssl_options.h \ projects/wolfssl_override.props WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ @@ -148,8 +148,8 @@ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(VC11_LIBVCXPROJ) \ $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) $(VC14_LIBVCXPROJ) \ - $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) $(VC17_LIBVCXPROJ) \ - $(VC17_SRCVCXPROJ) + $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ + $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) bin_SCRIPTS = curl-config @@ -298,8 +298,8 @@ checksrc: vc-ide: $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ - $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) $(VC17_LIBVCXPROJ_DEPS) \ - $(VC17_SRCVCXPROJ_DEPS) + $(VC14_10_LIBVCXPROJ_DEPS) $(VC14_10_SRCVCXPROJ_DEPS) \ + $(VC14_30_LIBVCXPROJ_DEPS) $(VC14_30_SRCVCXPROJ_DEPS) @(win32_lib_srcs='$(LIB_CFILES)'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_rc='$(LIB_RCFILES)'; \ @@ -556,7 +556,7 @@ function gen_element(type, dir, file)\ -v src_x_hdrs="$$sorted_src_x_hdrs" \ "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_10_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -569,18 +569,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_LIBTMPL) > $(VC14_10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_10_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_SRCTMPL) > $(VC14_10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC17_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_30_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -593,16 +593,16 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC17_LIBTMPL) > $(VC17_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_30_LIBTMPL) > $(VC14_30_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC17_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_30_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC17_SRCTMPL) > $(VC17_SRCVCXPROJ) || { exit 1; };) + "$$awk_code" $(srcdir)/$(VC14_30_SRCTMPL) > $(VC14_30_SRCVCXPROJ) || { exit 1; };) tidy: (cd src && $(MAKE) tidy) -- cgit v1.2.1