[msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected.
This commit is contained in:
parent
ad23ee761b
commit
11e93c5f2b
9
make.bat
9
make.bat
@ -105,10 +105,8 @@ if "%BUILD_ARCH%"=="" (
|
|||||||
)
|
)
|
||||||
) else if "%BUILD_ARCH%"=="x64" (
|
) else if "%BUILD_ARCH%"=="x64" (
|
||||||
set WINDOWS_ARCH= Win64
|
set WINDOWS_ARCH= Win64
|
||||||
set MSBUILD_PLATFORM=x64
|
|
||||||
) else if "%BUILD_ARCH%"=="x86" (
|
) else if "%BUILD_ARCH%"=="x86" (
|
||||||
set WINDOWS_ARCH=
|
set WINDOWS_ARCH=
|
||||||
set MSBUILD_PLATFORM=win32
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if "%BUILD_VS_VER%"=="" (
|
if "%BUILD_VS_VER%"=="" (
|
||||||
@ -116,6 +114,13 @@ if "%BUILD_VS_VER%"=="" (
|
|||||||
set BUILD_VS_YEAR=2013
|
set BUILD_VS_YEAR=2013
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if "%BUILD_ARCH%"=="x64" (
|
||||||
|
set MSBUILD_PLATFORM=x64
|
||||||
|
) else if "%BUILD_ARCH%"=="x86" (
|
||||||
|
set MSBUILD_PLATFORM=win32
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
|
set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user