Fixed WinRT dependencies and Ice build issue

1 files changed, 2 insertions, 2 deletions

diff --git a/cpp/src/IceStormLib/winrt/.depend.mak b/cpp/src/IceStormLib/winrt/.depend.mak
index 5f459b2ec3e..24ed75be4ff 100644
--- a/cpp/src/IceStormLib/winrt/.depend.mak
+++ b/cpp/src/IceStormLib/winrt/.depend.mak
@@ -1,5 +1,5 @@
-$(ARCH)\$(CONFIG)\IceStorm$(OBJEXT): ..\IceStorm.cpp "$(includedir)\IceStorm\IceStorm.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Format.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\StreamHelpers.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\Optional.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\UniquePtr.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Version.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\SlicedDataF.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\ObserverHelper.h" "$(includedir)\Ice\Instrumentation.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceStorm\Metrics.h" "$(includedir)\Ice\Metrics.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\DisableWarnings.h"
-$(ARCH)\$(CONFIG)\Metrics$(OBJEXT): ..\Metrics.cpp "$(includedir)\IceStorm\Metrics.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Format.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\StreamHelpers.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\Optional.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\UniquePtr.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Version.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\SlicedDataF.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\ObserverHelper.h" "$(includedir)\Ice\Instrumentation.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\Metrics.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\IceStorm$(OBJEXT): ..\IceStorm.cpp "$(includedir)\IceStorm\IceStorm.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Format.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\StreamHelpers.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\Optional.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\UniquePtr.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Version.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\SlicedDataF.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\ObserverHelper.h" "$(includedir)\Ice\Instrumentation.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceStorm\Metrics.h" "$(includedir)\Ice\Metrics.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\DisableWarnings.h" 
+$(ARCH)\$(CONFIG)\Metrics$(OBJEXT): ..\Metrics.cpp "$(includedir)\IceStorm\Metrics.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Format.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\StreamHelpers.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\Optional.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\UniquePtr.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Version.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\SlicedDataF.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\ObserverHelper.h" "$(includedir)\Ice\Instrumentation.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\Metrics.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\DisableWarnings.h" 
 $(HDIR)\IceStorm.h ..\IceStorm.cpp: "$(slicedir)\IceStorm\IceStorm.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(slicedir)\IceStorm\Metrics.ice" "$(slicedir)\Ice\Metrics.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
 $(HDIR)\Metrics.h ..\Metrics.cpp: "$(slicedir)\IceStorm\Metrics.ice" "$(slicedir)\Ice\Metrics.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"