333941 - fix mingw cross-compile & static builds

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[cls]

I managed to get ff, tb & sm building & running with cross-mingw again.

Comment 1

[cls]

Attachment: v1

Standard stuff:
* Fix case in header includes
* Fix link order
* Add libraries to link lines (why are the standards libs for msvc listed in configure.in as well as a bunch of makefiles?)
* Fix paths in .rc files
* Fix __declspec declarations

Comment 2

[Benjamin Smedberg]

Comment on attachment 218384 [details] [diff] [review]
v1

>Index: browser/app/splash.rc

>-IDC_GRAB                CURSOR  DISCARDABLE     "..\\..\\widget\\src\\build\\res\\grab.cur"

>+IDC_GRAB                CURSOR  DISCARDABLE     "../../widget/src/build/res/grab.cur"

This works on MSVC still?

>Index: config/static-config.mk

>-STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
>+STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32 winmm)

Do we need imm32 without cairo-gfx, or should it go with usp10 below?

Comment 3

[cls]

(In reply to comment #2)
> (From update of attachment 218384 [details] [diff] [review] [edit])
> >Index: browser/app/splash.rc
> 
> >-IDC_GRAB                CURSOR  DISCARDABLE     "..\\..\\widget\\src\\build\\res\\grab.cur"
> 
> >+IDC_GRAB                CURSOR  DISCARDABLE     "../../widget/src/build/res/grab.cur"
> 
> This works on MSVC still?

Unverified but widget/src/build/widget.rc uses unix paths without a problem so I don't see why the splash.rcs would be a problem.

> >Index: config/static-config.mk
> 
> >-STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
> >+STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32 winmm)
> 
> Do we need imm32 without cairo-gfx, or should it go with usp10 below?

It's needed for the IME functionality used by widget.

Comment 4

[cls]

Attachment: for the 1.8 branch

Only a subset of the changes are needed for the 1.8 branch.

Comment 5

[Benjamin Smedberg]

Comment on attachment 220666 [details] [diff] [review]
for the 1.8 branch

Wait until after ff2a2 is out and the branch tree reopens to land this.

Comment 6

[:Gavin Sharp [email: [e-mail]]]

I checked in the following bustage fix to mozilla/config/static-config.mk, on the branch:
-STATIC_EXTRA_LIBS += urlmon
+STATIC_EXTRA_LIBS += -lurlmon

Comment 7

[cls]

Last I checked, MSVC didn't understand the -lfoo syntax.  I checked in a fix to use EXPAND_LIBNAME instead.

Comment 8

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #7)
> Last I checked, MSVC didn't understand the -lfoo syntax.

Doh, you're right. Sorry about that.