This commit is contained in:
Jelani 2016-06-01 11:32:37 -07:00
Родитель 7bc07f6bc7
Коммит 1ac82f83d7
2 изменённых файлов: 15 добавлений и 8 удалений

Просмотреть файл

@ -32,6 +32,16 @@
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../build/native/x64/Release/umqtt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="Win64Debug" Condition="(( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And ('$(Platform)' == 'arm' ) )">
<Link>
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../build/native/arm/Debug/umqtt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="Win64Release" Condition="(( $(Configuration.ToLower().IndexOf('debug')) == -1 ) And ('$(Platform)' == 'arm' ) )">
<Link>
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../build/native/arm/Release/umqtt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<UsingTask TaskName="Microsoft_Azure_Mqtt_Contains" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
<ParameterGroup>
<Text Output="false" ParameterType="System.String" />
@ -82,4 +92,9 @@
</Target>
<Target Name="Microsoft_Azure_Mqtt_redist_AfterBuild_Win64_and_Release" Label="Win64 and Release" Condition="'$(Platform.ToLower())' == 'x64' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 )" AfterTargets="Microsoft_Azure_Mqtt_redist_AfterBuild">
</Target>
<Target Name="Microsoft_Azure_Mqtt_redist_AfterBuild_Arm_and_Debug" Label="Arm and Debug" Condition="'$(Platform.ToLower())' == 'arm' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 )" AfterTargets="Microsoft_Azure_Mqtt_redist_AfterBuild">
</Target>
<Target Name="Microsoft_Azure_Mqtt_redist_AfterBuild_Arm_and_Release" Label="Arm and Release" Condition="'$(Platform.ToLower())' == 'arm' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 )" AfterTargets="Microsoft_Azure_Mqtt_redist_AfterBuild">
</Target>
</Project>

Просмотреть файл

@ -45,11 +45,6 @@ echo Build root is %build-root%
echo Build path is %build-path%
echo Client root is %client-root%
if exist %build-path%\azure_mqtt_nuget (
rmdir /s/q %USERPROFILE%\azure_mqtt_nuget
rem no error checking
)
if exist %build-path%\azure_mqtt_output (
rmdir /s/q %build-path%\azure_mqtt_output
rem no error checking
@ -90,9 +85,6 @@ rem -- Copy all x64 Release files from cmake build directory to the repo directo
xcopy /q /y /R %build-path%\umqtt_x64\Release\*.* %build-path%\azure_mqtt_output\x64\Release\*.*
if %errorlevel% neq 0 exit /b %errorlevel%
if exist *.nupkg (
del *.nupkg
)
rem -----------------------------------------------------------------------------
rem -- build with CMAKE ARM