Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 52c4046

Browse files
vbwagnervbwagner
committed
Use env vars Platform and PlatformToolset on all msbuild invocations instead of if %ARCH%==
1 parent 4564168 commit 52c4046

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

‎build/helpers/dependencies.cmd‎

100644100755
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ tar xf libiconv-%ICONV_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
9797
CD /D %DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
9898
cp -v %ROOT%/patches/libiconv/libiconv-%ICONV_VER%-%SDK%.patch libiconv.patch
9999
patch -f -p0 < libiconv.patch || GOTO :ERROR
100-
IF %ARCH% == X64 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
101-
IF %ARCH% == X86 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
100+
msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%|| GOTO :ERROR
102101
cp -av include %DEPENDENCIES_BIN_DIR%\iconv || GOTO :ERROR
103102
cp -av iconv.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
104103
cp -av config.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
@@ -143,8 +142,7 @@ IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid.sln || GOTO :ERROR
143142
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid\ossp_uuid.vcxproj || GOTO :ERROR
144143
IF %ARCH% == X64 sed -i 's/Win32/x64/g' example\example.vcxproj || GOTO :ERROR
145144
IF %ARCH% == X64 sed -i 's/Win32/x64/g' uuid_cli\uuid_cli.vcxproj || GOTO :ERROR
146-
IF %ARCH% == X64 msbuild ossp_uuid.sln /m /p:Configuration=Release /p:Platform=x64 || GOTO :ERROR
147-
IF %ARCH% == X86 msbuild ossp_uuid.sln /m /p:Configuration=Release || GOTO :ERROR
145+
msbuild ossp_uuid.sln /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
148146
MKDIR %DEPENDENCIES_BIN_DIR%\uuid\lib
149147
cp -av include %DEPENDENCIES_BIN_DIR%\uuid || GOTO :ERROR
150148
IF %ARCH% == X64 cp -av x64\Release\ossp_uuid.lib %DEPENDENCIES_BIN_DIR%\uuid\lib\uuid.lib || GOTO :ERROR
@@ -236,8 +234,7 @@ tar xf gettext-%GETTEXT_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
236234
CD /D %DEPENDENCIES_SRC_DIR%\gettext-*
237235
cp -v %ROOT%/patches/gettext/gettext-%GETTEXT_VER%-%SDK%.patch gettext.patch
238236
patch -f -p0 < gettext.patch || GOTO :ERROR
239-
IF %ARCH% == X64 msbuild libintl.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
240-
IF %ARCH% == X86 msbuild libintl.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
237+
msbuild libintl.vcxproj /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
241238
MKDIR %DEPENDENCIES_BIN_DIR%\libintl\lib %DEPENDENCIES_BIN_DIR%\libintl\include
242239
cp -v Release*/*.dll %DEPENDENCIES_BIN_DIR%\libintl\lib || GOTO :ERROR
243240
cp -v Release*/*.lib %DEPENDENCIES_BIN_DIR%\libintl\lib || GOTO :ERROR
@@ -269,8 +266,7 @@ rm -rf %DEPENDENCIES_BIN_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu
269266
MKDIR %DEPENDENCIES_BIN_DIR%\icu
270267
7z x icu4c-56_1-src.zip -o%DEPENDENCIES_SRC_DIR% -y
271268
CD /D %DEPENDENCIES_SRC_DIR%\icu
272-
IF %ARCH% == X86 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
273-
IF %ARCH% == X64 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
269+
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
274270
IF %ARCH% == X64 (
275271
cp -va %DEPENDENCIES_SRC_DIR%\icu\bin64 %DEPENDENCIES_BIN_DIR%\icu\bin || GOTO :ERROR
276272
cp -va %DEPENDENCIES_SRC_DIR%\icu\lib64 %DEPENDENCIES_BIN_DIR%\icu\lib || GOTO :ERROR

‎build/helpers/setvars.cmd‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ IF %ARCH% == X64 SET PATH=%PERL64_BIN%;%PATH%
2828

2929
IF %ARCH% == X86 SET PERL_EXE=%PERL32_BIN%\perl
3030
IF %ARCH% == X64 SET PERL_EXE=%PERL64_BIN%\perl
31-
31+
IF %ARCH% == X86 SET Platform=Win32
32+
IF %ARCH% == X64 SET Platform=X64
3233
IF %SDK% == SDK71 (
3334
SET REDIST_YEAR=2010
3435
SET PlatformToolset=v100

0 commit comments

Comments
 (0)