Add support for vcvarsall

This commit is contained in:
spycrab
2020-02-09 16:10:35 +01:00
parent 85be3c6d58
commit a3f5776703
2 changed files with 7 additions and 1 deletions

View File

@@ -112,6 +112,7 @@ if __name__ == "__main__":
os.putenv("VS_VERSION", compiler["version"])
os.putenv("VS_EDITION", compiler["edition"])
os.putenv("VCVARSALL", compiler.get("vcvarsall", ""))
os.putenv("USE_VS", "1")
else:
print("Unknown compiler '{}'".format(compiler.name))

View File

@@ -17,9 +17,14 @@ REM along with this program. If not, see <http://www.gnu.org/licenses/>.
IF "%USE_VS%"=="1" (
call "%PROGRAMFILES(x86)%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\Common7\Tools\VsDevCmd.bat"
if "%VCVARSALL%"=="" (
call "%PROGRAMFILES(x86)%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\Common7\Tools\VsDevCmd.bat"
) else (
call "%PROGRAMFILES(x86)%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" %VCVARSALL%
)
)
:configure
call ..\qt-everywhere-src-%RELEASE%\configure.bat ^
-opensource -confirm-license ^