romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-15 01:41:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

projects: Fix Visual Studio projects SSH builds

Browse source 
- Generate VQUIC and VSSH filenames in Visual Studio project files.

Prior to this change generated Visual Studio project configurations that
enabled SSH did not build properly. Broken since SSH files were moved to
lib/vssh 3 months ago in 5b2d703.

Fixes https://github.com/curl/curl/issues/4492
Fixes https://github.com/curl/curl/issues/4630
Closes https://github.com/curl/curl/pull/4607
This commit is contained in:
Jay Satiro 2019-11-17 03:08:40 -05:00
parent 036ebac013
commit ee5c68a963
12 changed files with 219 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
projects/Windows/VC10/lib/libcurl.tmpl
View file

@ -2325,11 +2325,15 @@
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

4
projects/Windows/VC11/lib/libcurl.tmpl
View file

@ -2381,11 +2381,15 @@
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

4
projects/Windows/VC12/lib/libcurl.tmpl
View file

@ -2381,11 +2381,15 @@
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

4
projects/Windows/VC14/lib/libcurl.tmpl
View file

@ -2381,11 +2381,15 @@
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

4
projects/Windows/VC15/lib/libcurl.tmpl
View file

@ -2353,11 +2353,15 @@
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

4
projects/Windows/VC6/lib/libcurl.tmpl
View file

@ -730,6 +730,8 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VQUIC_C_FILES
CURL_LIB_VSSH_C_FILES
CURL_LIB_VTLS_C_FILES
# End Group
# Begin Group "Header Files"
@ -737,6 +739,8 @@ CURL_LIB_VTLS_C_FILES
# PROP Default_Filter ""
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VQUIC_H_FILES
CURL_LIB_VSSH_H_FILES
CURL_LIB_VTLS_H_FILES
# End Group
# Begin Group "Resource Files"

28
projects/Windows/VC7.1/lib/libcurl.tmpl
View file

@ -1281,6 +1281,34 @@ CURL_LIB_VAUTH_C_FILES
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vquic"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VQUIC_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VQUIC_H_FILES
</Filter>
</Filter>
<Filter
Name="vssh"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VSSH_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VSSH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
Filter="">

28
projects/Windows/VC7/lib/libcurl.tmpl
View file

@ -1135,6 +1135,34 @@ CURL_LIB_VAUTH_C_FILES
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vquic"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VQUIC_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VQUIC_H_FILES
</Filter>
</Filter>
<Filter
Name="vssh"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VSSH_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VSSH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
Filter="">

28
projects/Windows/VC8/lib/libcurl.tmpl
View file

@ -3642,6 +3642,34 @@ CURL_LIB_VAUTH_C_FILES
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vquic"
>
<Filter
Name="Source Files"
>
CURL_LIB_VQUIC_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VQUIC_H_FILES
</Filter>
</Filter>
<Filter
Name="vssh"
>
<Filter
Name="Source Files"
>
CURL_LIB_VSSH_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VSSH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
>

28
projects/Windows/VC9/lib/libcurl.tmpl
View file

@ -3583,6 +3583,34 @@ CURL_LIB_VAUTH_C_FILES
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vquic"
>
<Filter
Name="Source Files"
>
CURL_LIB_VQUIC_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VQUIC_H_FILES
</Filter>
</Filter>
<Filter
Name="vssh"
>
<Filter
Name="Source Files"
>
CURL_LIB_VSSH_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VSSH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
>

14
projects/generate.bat
View file

@ -303,6 +303,14 @@ rem
for /f "delims=" %%c in ('dir /b ..\lib\vauth\*.c') do call :element %1 lib\vauth "%%c" %3
) else if "!var!" == "CURL_LIB_VAUTH_H_FILES" (
for /f "delims=" %%h in ('dir /b ..\lib\vauth\*.h') do call :element %1 lib\vauth "%%h" %3
) else if "!var!" == "CURL_LIB_VQUIC_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\vquic\*.c') do call :element %1 lib\vquic "%%c" %3
) else if "!var!" == "CURL_LIB_VQUIC_H_FILES" (
for /f "delims=" %%h in ('dir /b ..\lib\vquic\*.h') do call :element %1 lib\vquic "%%h" %3
) else if "!var!" == "CURL_LIB_VSSH_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\vssh\*.c') do call :element %1 lib\vssh "%%c" %3
) else if "!var!" == "CURL_LIB_VSSH_H_FILES" (
for /f "delims=" %%h in ('dir /b ..\lib\vssh\*.h') do call :element %1 lib\vssh "%%h" %3
) else if "!var!" == "CURL_LIB_VTLS_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\vtls\*.c') do call :element %1 lib\vtls "%%c" %3
) else if "!var!" == "CURL_LIB_VTLS_H_FILES" (
@ -319,7 +327,7 @@ rem Generates a single file xml element.
rem
rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9
rem or vcxproj for VC10, VC11, VC12, VC14 and VC15)
rem %2 - Directory (src, lib, lib\vauth or lib\vtls)
rem %2 - Directory (src, lib, lib\vauth, lib\vquic, lib\vssh, lib\vtls)
rem %3 - Source filename
rem %4 - Output project file
rem
@ -327,6 +335,10 @@ rem
set "SPACES= "
if "%2" == "lib\vauth" (
set "TABS= "
) else if "%2" == "lib\vquic" (
set "TABS= "
) else if "%2" == "lib\vssh" (
set "TABS= "
) else if "%2" == "lib\vtls" (
set "TABS= "
) else (