Bug 323732 - Missing cursor resources in Windows xulrunner needed for various CSS cursor types, r=vlad

toolkit/library/libxul-config.mk

@@ -50,6 +50,8 @@ CPPSRCS += \
 	nsDllMain.cpp \
 	$(NULL)
 
+RCINCLUDE = widget.rc
+
 ifndef MOZ_NATIVE_ZLIB
 CPPSRCS += dlldeps-zlib.cpp
 DEFINES += -DZLIB_INTERNAL
@@ -238,4 +240,3 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LIBS += macmorefiles_s
 EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
 endif
-

toolkit/library/libxul-rules.mk

@@ -51,7 +51,11 @@ else
 EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
 endif
 
-LOCAL_INCLUDES += -I$(topsrcdir)/config
+# need widget/src/windows for resource.h (included from widget.rc)
+LOCAL_INCLUDES += \
+	-I$(topsrcdir)/config \
+	-I$(topsrcdir)/widget/src/windows \
+	$(NULL)
 
 OS_LIBS += $(LIBICONV)
 
@@ -77,7 +81,10 @@ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
 endif
 
-export:: dlldeps.cpp dlldeps-obs.cpp
+export:: dlldeps.cpp dlldeps-obs.cpp widget.rc
+
+widget.rc: $(topsrcdir)/widget/src/build/widget.rc
+	$(INSTALL) $^ .
 
 dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
 	$(INSTALL) $^ .