diff options
| author | Anton Fedchin <anightik@gmail.com> | 2016-09-19 11:41:46 +0300 |
|---|---|---|
| committer | Anton Fedchin <anightik@gmail.com> | 2016-09-21 10:59:52 +0300 |
| commit | 52d8887f5e2ef6cb5dbe7c1d34264d8a9e9d169f (patch) | |
| tree | 5c58349ca3504aa2a31c1918b4980d66da1eceaf /tools/buildsteps/win32 | |
| parent | 1062eef526390d761d4d29252b36b757793640f2 (diff) | |
[buildsteps] win32: use proper way to set VC env vars (depends on build arch).
Diffstat (limited to 'tools/buildsteps/win32')
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/win32/make-mingwlibs.bat index d1567a0adc..0d94facd05 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/win32/make-mingwlibs.bat @@ -3,14 +3,13 @@ SETLOCAL rem batch file to compile mingw libs via BuildSetup SET WORKDIR=%base_dir% -rem set M$ env -call "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat" || exit /b 1 SET PROMPTLEVEL=prompt SET BUILDMODE=clean SET opt=mintty SET build32=yes SET build64=no +SET vcarch=x86 SET msys2=msys64 SET tools=mingw FOR %%b in (%1, %2, %3) DO ( @@ -21,9 +20,12 @@ FOR %%b in (%1, %2, %3) DO ( IF %%b==build64 ( SET build64=yes SET build32=no + SET vcarch=x64 ) IF %%b==msvc SET tools=msvc ) +rem set MSVC env +call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %vcarch% || exit /b 1 IF "%WORKDIR%"=="" ( SET WORKDIR=%~dp0\..\..\.. |