Skip to content

Commit 1ebb3f1

Browse files
act262chaoxizhang
and
chaoxizhang
authored
Add Windows VSBuildTools VC17 compile support (#3823)
Co-authored-by: chaoxizhang <[email protected]>
1 parent ad3f690 commit 1ebb3f1

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

build/AutoBuildForWindows.bat

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ rem --arm64 folder bin\ARM64
3434
rem
3535
rem [winsdk_version] : full Windows 10 SDK number (e.g. 10.0.17763.0)
3636
rem [vc_version] : Specify a VC++ version
37+
rem VC17 for VC++ 2022
3738
rem VC16 for VC++ 2019
3839
rem VC15 for VC++ 2017
3940
rem
@@ -97,6 +98,15 @@ goto :EOF
9798
set MinGWPath=C:\MinGW\bin
9899
set MsysPath=C:\MinGW\msys\1.0\bin
99100

101+
set VC17BuildToolsPath=C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC
102+
set VC17CommunityPath=C:\Program Files\Microsoft Visual Studio\2022\Community\VC
103+
set VC17ProfessionalPath=C:\Program Files\Microsoft Visual Studio\2022\Professional\VC
104+
set VC17EnterprisePath=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC
105+
if exist "%VC17BuildToolsPath%" set VC17PATH=%VC17BuildToolsPath%
106+
if exist "%VC17CommunityPath%" set VC17PATH=%VC17CommunityPath%
107+
if exist "%VC17ProfessionalPath%" set VC17PATH=%VC17ProfessionalPath%
108+
if exist "%VC17EnterprisePath%" set VC17PATH=%VC17EnterprisePath%
109+
100110
set VC16BuildToolsPath=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC
101111
set VC16CommunityPath=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC
102112
set VC16ProfessionalPath=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC
@@ -130,14 +140,21 @@ goto :EOF
130140
set VCVARSPATH=%VCPATH%
131141
if exist "%VC15Path%" set VCVARSPATH=%VC15Path%\Auxiliary\Build
132142
if exist "%VC16Path%" set VCVARSPATH=%VC16Path%\Auxiliary\Build
143+
if exist "%VC17Path%" set VCVARSPATH=%VC17Path%\Auxiliary\Build
133144

134-
if /I "%OPENH264_VC_VERSION%" == "VC15" (
145+
if /I "%OPENH264_VC_VERSION%" == "VC17" (
135146
set VCPATH=
136-
set "VCVARSPATH=%VC15Path%\Auxiliary\Build"
137-
) else if /I "%OPENH264_VC_VERSION%" == "VC12" (
138-
set "VCPATH=%VC12Path%"
139-
set "VCVARSPATH=%VCPATH%"
140-
)
147+
set "VCVARSPATH=%VC17Path%\Auxiliary\Build"
148+
) else if /I "%OPENH264_VC_VERSION%" == "VC16" (
149+
set VCPATH=
150+
set "VCVARSPATH=%VC16Path%\Auxiliary\Build"
151+
) else if /I "%OPENH264_VC_VERSION%" == "VC15" (
152+
set VCPATH=
153+
set "VCVARSPATH=%VC15Path%\Auxiliary\Build"
154+
) else if /I "%OPENH264_VC_VERSION%" == "VC12" (
155+
set "VCPATH=%VC12Path%"
156+
set "VCVARSPATH=%VCPATH%"
157+
)
141158

142159
set GasScriptPath=%VCPATH%\bin
143160

@@ -392,6 +409,7 @@ rem ***********************************************
392409
echo Win32-Release-ASM
393410
echo [winsdk_version] : full Windows 10 SDK number (e.g. 10.0.17763.0)
394411
echo [vc_version] : Specify a VC++ version
412+
echo VC17 for VC++ 2022
395413
echo VC16 for VC++ 2019
396414
echo VC15 for VC++ 2017
397415

0 commit comments

Comments
 (0)