Skip to content

Commit

Permalink
projects: add VC14.20 project files
Browse files Browse the repository at this point in the history
Windows projects included VC14, VC14.10, VC14.30 but not VC14.20.
OpenSSL and Wolf SSL scripts mention VC14.20 so I don't see a reason why
this is missing. Updated the templates to produce a VC14.20 project.
Project opens in Visual Studio 2019 as expected.

Closes #12282
  • Loading branch information
dsv123 authored and bagder committed Nov 7, 2023
1 parent 01d9b8b commit 2828709
Show file tree
Hide file tree
Showing 13 changed files with 5,810 additions and 4 deletions.
12 changes: 12 additions & 0 deletions Makefile.am
Expand Up @@ -88,6 +88,13 @@ 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_20_LIBTMPL = projects/Windows/VC14.20/lib/libcurl.tmpl
VC14_20_LIBVCXPROJ = projects/Windows/VC14.20/lib/libcurl.vcxproj.dist
VC14_20_LIBVCXPROJ_DEPS = $(VC14_20_LIBTMPL) Makefile.am lib/Makefile.inc
VC14_20_SRCTMPL = projects/Windows/VC14.20/src/curl.tmpl
VC14_20_SRCVCXPROJ = projects/Windows/VC14.20/src/curl.vcxproj.dist
VC14_20_SRCVCXPROJ_DEPS = $(VC14_20_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
Expand Down Expand Up @@ -124,6 +131,11 @@ VC_DIST = projects/README.md \
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.20/curl-all.sln \
projects/Windows/VC14.20/lib/libcurl.sln \
projects/Windows/VC14.20/lib/libcurl.vcxproj.filters \
projects/Windows/VC14.20/src/curl.sln \
projects/Windows/VC14.20/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 \
Expand Down
9 changes: 9 additions & 0 deletions projects/Windows/VC14.20/.gitignore
@@ -0,0 +1,9 @@
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
#
# SPDX-License-Identifier: curl

/*.opendb
/*.opensdf
/*.sdf
/*.vc.db
/.vs
298 changes: 298 additions & 0 deletions projects/Windows/VC14.20/curl-all.sln

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions projects/Windows/VC14.20/lib/.gitignore
@@ -0,0 +1,10 @@
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
#
# SPDX-License-Identifier: curl

/*.opensdf
/*.sdf
/*.user
/*.vc.db
/*.vcxproj
/.vs
181 changes: 181 additions & 0 deletions projects/Windows/VC14.20/lib/libcurl.sln

Large diffs are not rendered by default.

2,381 changes: 2,381 additions & 0 deletions projects/Windows/VC14.20/lib/libcurl.tmpl

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions projects/Windows/VC14.20/lib/libcurl.vcxproj.filters
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
</Project>
10 changes: 10 additions & 0 deletions projects/Windows/VC14.20/src/.gitignore
@@ -0,0 +1,10 @@
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
#
# SPDX-License-Identifier: curl

/*.opensdf
/*.sdf
/*.user
/*.vc.db
/*.vcxproj
/.vs
181 changes: 181 additions & 0 deletions projects/Windows/VC14.20/src/curl.sln

Large diffs are not rendered by default.

2,671 changes: 2,671 additions & 0 deletions projects/Windows/VC14.20/src/curl.tmpl

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions projects/Windows/VC14.20/src/curl.vcxproj.filters
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion projects/Windows/VC14.30/src/curl.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
# Visual Studio 17
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.vcxproj", "{5228E9CE-A216-422F-A5E6-58E95E2DD71D}"
EndProject
Global
Expand Down
25 changes: 22 additions & 3 deletions projects/generate.bat
Expand Up @@ -56,7 +56,9 @@ rem ***************************************************************************
set VERSION=VC14
) else if /i "%~1" == "vc14.10" (
set VERSION=VC14.10
) else if /i "%~1" == "vc14.30" (
) else if /i "%~1" == "vc14.20" (
set VERSION=VC14.20
)else if /i "%~1" == "vc14.30" (
set VERSION=VC14.30
) else if /i "%~1" == "-clean" (
set MODE=CLEAN
Expand Down Expand Up @@ -88,6 +90,7 @@ rem ***************************************************************************
if "%VERSION%" == "VC12" goto vc12
if "%VERSION%" == "VC14" goto vc14
if "%VERSION%" == "VC14.10" goto vc14.10
if "%VERSION%" == "VC14.20" goto vc14.20
if "%VERSION%" == "VC14.30" goto vc14.30

:vc10
Expand Down Expand Up @@ -164,6 +167,21 @@ rem ***************************************************************************
)

if not "%VERSION%" == "ALL" goto success

:vc14.20
echo.

if "%MODE%" == "GENERATE" (
echo Generating VC14.20 project files
call :generate vcxproj Windows\VC14.20\src\curl.tmpl Windows\VC14.20\src\curl.vcxproj
call :generate vcxproj Windows\VC14.20\lib\libcurl.tmpl Windows\VC14.20\lib\libcurl.vcxproj
) else (
echo Removing VC14.20 project files
call :clean Windows\VC14.20\src\curl.vcxproj
call :clean Windows\VC14.20\lib\libcurl.vcxproj
)

if not "%VERSION%" == "ALL" goto success

:vc14.30
echo.
Expand All @@ -182,7 +200,7 @@ rem ***************************************************************************

rem Main generate function.
rem
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10 and VC14.30)
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10, VC14.20 and VC14.30)
rem %2 - Input template file
rem %3 - Output project file
rem
Expand Down Expand Up @@ -263,7 +281,7 @@ rem

rem Generates a single file xml element.
rem
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10 and VC14.30)
rem %1 - Project Type (vcxproj for VC10, VC11, VC12, VC14, VC14.10, VC14.20 and VC14.30)
rem %2 - Directory (src, lib, lib\vauth, lib\vquic, lib\vssh, lib\vtls)
rem %3 - Source filename
rem %4 - Output project file
Expand Down Expand Up @@ -359,6 +377,7 @@ rem
echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015
echo vc14.10 - Use Visual Studio 2017
echo vc14.20 - Use Visual Studio 2019
echo vc14.30 - Use Visual Studio 2022
echo.
echo -clean - Removes the project files
Expand Down

0 comments on commit 2828709

Please sign in to comment.