From ee5c68a963c9959ea1a5b6762fdea1dd94de98d1 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Sun, 17 Nov 2019 03:08:40 -0500 Subject: projects: Fix Visual Studio projects SSH builds - 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 --- projects/Windows/VC10/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC11/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC12/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC14/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC15/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC6/lib/libcurl.tmpl | 4 ++++ projects/Windows/VC7.1/lib/libcurl.tmpl | 28 ++++++++++++++++++++++++++++ projects/Windows/VC7/lib/libcurl.tmpl | 28 ++++++++++++++++++++++++++++ projects/Windows/VC8/lib/libcurl.tmpl | 28 ++++++++++++++++++++++++++++ projects/Windows/VC9/lib/libcurl.tmpl | 28 ++++++++++++++++++++++++++++ projects/generate.bat | 14 +++++++++++++- 11 files changed, 149 insertions(+), 1 deletion(-) (limited to 'projects') diff --git a/projects/Windows/VC10/lib/libcurl.tmpl b/projects/Windows/VC10/lib/libcurl.tmpl index d1f756bc5..d6c62b593 100644 --- a/projects/Windows/VC10/lib/libcurl.tmpl +++ b/projects/Windows/VC10/lib/libcurl.tmpl @@ -2325,11 +2325,15 @@ CURL_LIB_C_FILES CURL_LIB_VAUTH_C_FILES +CURL_LIB_VQUIC_C_FILES +CURL_LIB_VSSH_C_FILES CURL_LIB_VTLS_C_FILES CURL_LIB_H_FILES CURL_LIB_VAUTH_H_FILES +CURL_LIB_VQUIC_H_FILES +CURL_LIB_VSSH_H_FILES CURL_LIB_VTLS_H_FILES diff --git a/projects/Windows/VC11/lib/libcurl.tmpl b/projects/Windows/VC11/lib/libcurl.tmpl index a9145b300..946793f32 100644 --- a/projects/Windows/VC11/lib/libcurl.tmpl +++ b/projects/Windows/VC11/lib/libcurl.tmpl @@ -2381,11 +2381,15 @@ CURL_LIB_C_FILES CURL_LIB_VAUTH_C_FILES +CURL_LIB_VQUIC_C_FILES +CURL_LIB_VSSH_C_FILES CURL_LIB_VTLS_C_FILES CURL_LIB_H_FILES CURL_LIB_VAUTH_H_FILES +CURL_LIB_VQUIC_H_FILES +CURL_LIB_VSSH_H_FILES CURL_LIB_VTLS_H_FILES diff --git a/projects/Windows/VC12/lib/libcurl.tmpl b/projects/Windows/VC12/lib/libcurl.tmpl index 7da14967e..9cdb4c20b 100644 --- a/projects/Windows/VC12/lib/libcurl.tmpl +++ b/projects/Windows/VC12/lib/libcurl.tmpl @@ -2381,11 +2381,15 @@ CURL_LIB_C_FILES CURL_LIB_VAUTH_C_FILES +CURL_LIB_VQUIC_C_FILES +CURL_LIB_VSSH_C_FILES CURL_LIB_VTLS_C_FILES CURL_LIB_H_FILES CURL_LIB_VAUTH_H_FILES +CURL_LIB_VQUIC_H_FILES +CURL_LIB_VSSH_H_FILES CURL_LIB_VTLS_H_FILES diff --git a/projects/Windows/VC14/lib/libcurl.tmpl b/projects/Windows/VC14/lib/libcurl.tmpl index 6acaf5d02..4ad8d222f 100644 --- a/projects/Windows/VC14/lib/libcurl.tmpl +++ b/projects/Windows/VC14/lib/libcurl.tmpl @@ -2381,11 +2381,15 @@ CURL_LIB_C_FILES CURL_LIB_VAUTH_C_FILES +CURL_LIB_VQUIC_C_FILES +CURL_LIB_VSSH_C_FILES CURL_LIB_VTLS_C_FILES CURL_LIB_H_FILES CURL_LIB_VAUTH_H_FILES +CURL_LIB_VQUIC_H_FILES +CURL_LIB_VSSH_H_FILES CURL_LIB_VTLS_H_FILES diff --git a/projects/Windows/VC15/lib/libcurl.tmpl b/projects/Windows/VC15/lib/libcurl.tmpl index 8662369b5..4060e6fbe 100644 --- a/projects/Windows/VC15/lib/libcurl.tmpl +++ b/projects/Windows/VC15/lib/libcurl.tmpl @@ -2353,11 +2353,15 @@ CURL_LIB_C_FILES CURL_LIB_VAUTH_C_FILES +CURL_LIB_VQUIC_C_FILES +CURL_LIB_VSSH_C_FILES CURL_LIB_VTLS_C_FILES CURL_LIB_H_FILES CURL_LIB_VAUTH_H_FILES +CURL_LIB_VQUIC_H_FILES +CURL_LIB_VSSH_H_FILES CURL_LIB_VTLS_H_FILES diff --git a/projects/Windows/VC6/lib/libcurl.tmpl b/projects/Windows/VC6/lib/libcurl.tmpl index 26cc2abba..a5a8b46ef 100644 --- a/projects/Windows/VC6/lib/libcurl.tmpl +++ b/projects/Windows/VC6/lib/libcurl.tmpl @@ -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" diff --git a/projects/Windows/VC7.1/lib/libcurl.tmpl b/projects/Windows/VC7.1/lib/libcurl.tmpl index ca12c0185..67c19297f 100644 --- a/projects/Windows/VC7.1/lib/libcurl.tmpl +++ b/projects/Windows/VC7.1/lib/libcurl.tmpl @@ -1281,6 +1281,34 @@ CURL_LIB_VAUTH_C_FILES CURL_LIB_VAUTH_H_FILES + + +CURL_LIB_VQUIC_C_FILES + + +CURL_LIB_VQUIC_H_FILES + + + + +CURL_LIB_VSSH_C_FILES + + +CURL_LIB_VSSH_H_FILES + + diff --git a/projects/Windows/VC7/lib/libcurl.tmpl b/projects/Windows/VC7/lib/libcurl.tmpl index 0fdc25f77..64994fe53 100644 --- a/projects/Windows/VC7/lib/libcurl.tmpl +++ b/projects/Windows/VC7/lib/libcurl.tmpl @@ -1135,6 +1135,34 @@ CURL_LIB_VAUTH_C_FILES CURL_LIB_VAUTH_H_FILES + + +CURL_LIB_VQUIC_C_FILES + + +CURL_LIB_VQUIC_H_FILES + + + + +CURL_LIB_VSSH_C_FILES + + +CURL_LIB_VSSH_H_FILES + + diff --git a/projects/Windows/VC8/lib/libcurl.tmpl b/projects/Windows/VC8/lib/libcurl.tmpl index 417333b5f..0a061c39e 100644 --- a/projects/Windows/VC8/lib/libcurl.tmpl +++ b/projects/Windows/VC8/lib/libcurl.tmpl @@ -3642,6 +3642,34 @@ CURL_LIB_VAUTH_C_FILES CURL_LIB_VAUTH_H_FILES + + +CURL_LIB_VQUIC_C_FILES + + +CURL_LIB_VQUIC_H_FILES + + + + +CURL_LIB_VSSH_C_FILES + + +CURL_LIB_VSSH_H_FILES + + diff --git a/projects/Windows/VC9/lib/libcurl.tmpl b/projects/Windows/VC9/lib/libcurl.tmpl index 62752d8f6..19681682a 100644 --- a/projects/Windows/VC9/lib/libcurl.tmpl +++ b/projects/Windows/VC9/lib/libcurl.tmpl @@ -3583,6 +3583,34 @@ CURL_LIB_VAUTH_C_FILES CURL_LIB_VAUTH_H_FILES + + +CURL_LIB_VQUIC_C_FILES + + +CURL_LIB_VQUIC_H_FILES + + + + +CURL_LIB_VSSH_C_FILES + + +CURL_LIB_VSSH_H_FILES + + diff --git a/projects/generate.bat b/projects/generate.bat index 32a88f51b..9aa0633dc 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -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 ( -- cgit v1.2.3