Bug 807593 - toolkit/library/makefile widget_winrt lib changes from elm. r=bbondy

toolkit/library/Makefile.in

@@ -18,8 +18,10 @@ FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1
 
 ifdef MOZ_METRO
+ifeq ($(OS_ARCH),WINNT)
 DIRS += winvccorlib
 endif
+endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # This is going to be a framework named "XUL", not an ordinary library named
@@ -296,6 +298,9 @@ endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_windows
+ifdef MOZ_METRO
+COMPONENT_LIBS += widget_winrt
+endif
 endif
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += wdgtos2
@@ -585,6 +590,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 m
 ifdef ACCESSIBILITY
 OS_LIBS += $(call EXPAND_LIBNAME,oleacc)
 endif
+ifdef MOZ_METRO
+OS_LIBS += $(call EXPAND_LIBNAME,uiautomationcore)
+endif
 ifdef _MSC_VER
 OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
 EXTRA_DSO_LDOPTS += \
@@ -607,6 +615,7 @@ EXTRA_DSO_LDOPTS += -DELAYLOAD:VCCORLIB$(CRTDLLVERSION).DLL
 endif
 EXTRA_DSO_LDOPTS += -DELAYLOAD:API-MS-WIN-CORE-WINRT-L$(CRTEXPDLLVERSION).DLL
 EXTRA_DSO_LDOPTS += -DELAYLOAD:API-MS-WIN-CORE-WINRT-STRING-L$(CRTEXPDLLVERSION).DLL
+EXTRA_DSO_LDOPTS += -DELAYLOAD:uiautomationcore.dll
 endif
 
 ifdef ACCESSIBILITY