diff options
author | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
---|---|---|
committer | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
commit | 46a1c80a41c6d5be7204fbd9c38875dd393b456f (patch) | |
tree | 61d4ce8b07e2943d37b2a13992330b5d1dddfbeb /msvc/build-external-btls.vcxproj | |
parent | b9e209fc9376f823707b674ea0a734a54b7a7fb4 (diff) |
Fix warnings and build errors when bumping Mono on alternative Windows platforms.
Several of the name changes fixes MSVC warnings where local variables
hides global variables using the same name.
Number of adjustments not building on platforms not defining HAVE_CLASSIC_WINAPI_SUPPORT.
Fix a couple of build projects not setting dependencies on build-init.vcxproj.
This could cause races in build order if projects depend on build initialization.
Added support to force external builds to use msbuild even if ninja is present.
Diffstat (limited to 'msvc/build-external-btls.vcxproj')
-rw-r--r-- | msvc/build-external-btls.vcxproj | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/msvc/build-external-btls.vcxproj b/msvc/build-external-btls.vcxproj index b3eddb01ed3..a07b4bb6d60 100644 --- a/msvc/build-external-btls.vcxproj +++ b/msvc/build-external-btls.vcxproj @@ -18,6 +18,11 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="build-init.vcxproj">
+ <Project>{92ae7622-5f58-4234-9a26-9ec71876b3f4}</Project>
+ </ProjectReference>
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E41DDF41-0916-454B-A7C2-6E410E45CAFD}</ProjectGuid>
<RootNamespace>buildexternalbtls</RootNamespace>
@@ -155,12 +160,12 @@ <_BtlsBuildCommand>build-external-btls.bat "$(_MonoBtlsSourceDir)" "$(_BtlsSourceDir)" "$(_BtlsBuildDir)" "$(_MonoOutputDir)" "$(_BtlsCFlags)" "$(Platform)" "$(Configuration)"</_BtlsBuildCommand>
</PropertyGroup>
<Target Name="_AfterBuildExternalBtls" Condition="'$(MONO_ENABLE_BTLS)' == 'true'">
- <Exec Command="$(_BtlsBuildCommand) "Build" "$(MSBuildBinPath)\"">
+ <Exec Command="$(_BtlsBuildCommand) "Build" "$(MSBuildBinPath)\" "$(_MonoExternalBuildForceMSBuild)"">
<Output TaskParameter="ExitCode" PropertyName="_BuildExternalBtlsExitCode" />
</Exec>
</Target>
<Target Name="_AfterCleanExternalBtls" Condition="'$(MONO_ENABLE_BTLS)' == 'true'">
- <Exec Command="$(_BtlsBuildCommand) "Clean" "$(MSBuildBinPath)\"">
+ <Exec Command="$(_BtlsBuildCommand) "Clean" "$(MSBuildBinPath)\" "$(_MonoExternalBuildForceMSBuild)"">
<Output TaskParameter="ExitCode" PropertyName="_CleanExternalBtlsExitCode" />
</Exec>
</Target>
|