From e73b5c29b2e4d179ce7312d333f9f73891ab4214 Mon Sep 17 00:00:00 2001 From: "Alexey.Golubev" Date: Wed, 4 Apr 2018 18:23:17 +0300 Subject: [PATCH] Fix the target chosing --- Common/3dParty/icu/fetch.bat | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Common/3dParty/icu/fetch.bat b/Common/3dParty/icu/fetch.bat index 8b671a9442..a277c914b9 100644 --- a/Common/3dParty/icu/fetch.bat +++ b/Common/3dParty/icu/fetch.bat @@ -4,34 +4,34 @@ CD /D %~dp0 SET ICU_MAJOR_VER=55 SET ICU_MINOR_VER=1 -SET platform=win_32 +SET build_platform=win_32 if defined ProgramFiles(x86) ( - SET platform=win_64 + SET build_platform=win_64 ) if defined TARGET ( - SET platform=%TARGET% + SET build_platform=%TARGET% ) -if "%TARGET%" == "win_32" ( +if "%build_platform%" == "win_32" ( SET MACHINE=x86 ) -if "%TARGET%" == "win_64" ( +if "%build_platform%" == "win_64" ( SET MACHINE=x64 ) -if not exist "%platform%" ( - md "%platform%" +if not exist "%build_platform%" ( + md "%build_platform%" ) -if not exist "%platform%\build" ( - md "%platform%\build" +if not exist "%build_platform%\build" ( + md "%build_platform%\build" ) -cd "%SCRIPTPATH%%platform%" +cd "%SCRIPTPATH%%build_platform%" -if exist "%SCRIPTPATH%%platform%\icu\" ( +if exist "%SCRIPTPATH%%build_platform%\icu\" ( echo "icu already exported" ) else ( svn export http://source.icu-project.org/repos/icu/tags/release-%ICU_MAJOR_VER%-%ICU_MINOR_VER%/icu4c ./icu @@ -45,20 +45,20 @@ if exist %VC64% ( call "%VC%\vcvarsall.bat" %MACHINE% -if "%platform%" == "win_64" ( +if "%build_platform%" == "win_64" ( MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:PlatformToolset=v140 /p:Platform="X64" ) else ( MSBuild.exe icu\source\allinone\allinone.sln /p:Configuration=Release /p:PlatformToolset=v140 /p:Platform="Win32" ) -if "%platform%" == "win_64" ( -XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin64\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icudt.lib" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib64\icuuc.lib" "%SCRIPTPATH%%platform%\build\" +if "%build_platform%" == "win_64" ( +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\bin64\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\bin64\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\lib64\icudt.lib" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\lib64\icuuc.lib" "%SCRIPTPATH%%build_platform%\build\" ) else ( -XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\bin\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icudt.lib" "%SCRIPTPATH%%platform%\build\" -XCOPY /Y "%SCRIPTPATH%%platform%\icu\lib\icuuc.lib" "%SCRIPTPATH%%platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\bin\icudt%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\bin\icuuc%ICU_MAJOR_VER%.dll" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\lib\icudt.lib" "%SCRIPTPATH%%build_platform%\build\" +XCOPY /Y "%SCRIPTPATH%%build_platform%\icu\lib\icuuc.lib" "%SCRIPTPATH%%build_platform%\build\" )