Last Comment Bug 614625 - Landing bug 611930 broke crosscompilation to windows on case sensitive systems r=khuey a=benjamin
authorJacek Caban <jacek@codeweavers.com>
Tue, 11 Jan 2011 10:19:20 +0000
changeset 60282 6106b8079342b90d54d3f29064a19cf60187bb32
parent 60281 808d5140670c5f12b9f13b1ddffb1c4255dc9d72
child 60283 9c8c705ffc5e9c8de41cf39835d14f20758d8f70
push idunknown
push userunknown
push dateunknown
reviewerskhuey, benjamin
bugs614625, 611930
milestone2.0b10pre
Last Comment Bug 614625 - Landing bug 611930 broke crosscompilation to windows on case sensitive systems r=khuey a=benjamin
toolkit/library/Makefile.in
widget/src/build/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -242,17 +242,17 @@ ifeq ($(OS_ARCH),SunOS)
 ifdef GNU_CC
 EXTRA_DSO_LDOPTS += -lelf
 else
 EXTRA_DSO_LDOPTS += -lelf -ldemangle
 endif
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi Ws2_32)
+OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
 OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 endif # WINNT
 ifeq ($(OS_ARCH),WINCE)
 OS_LIBS += $(call EXPAND_LIBNAME, aygshell uuid ole32 oleaut32 Ws2 ddraw)
 OS_LIBS += $(call EXPAND_LIBNAME, ceosutil libcmt comsuppw)
 ifdef WINCE_WINDOWS_MOBILE
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -58,17 +58,17 @@ EXTRA_DSO_LIBS	= gkgfx \
 		  $(NULL)
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../windows \
 		$(NULL)
 
-OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 Ws2_32)
+OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32)
 
 ifneq ($(OS_ARCH), WINCE)
 OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
 else
 OS_LIBS += $(call EXPAND_LIBNAME, aygshell ddraw)
 EXTRA_DSO_LDOPTS += $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib
 endif