242189 - Get branding working on OS/2 Firefox

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Kaply [:mkaply]]

Build changes to get branding working.

Comment 1

[Mike Kaply [:mkaply]]

Attachment: Fix

We were reusing RCFLAGS for both stages of the RC compile. This was wrong.

Also, I added support so we could use -D (translated it to -d in the rules.mk)

I made a change to Windows as well - the icons were incorrectly set as defines
instead of RCFLAGS

Comment 2

[jhp (no longer active)]

Comment on attachment 147387 [details] [diff] [review]
Fix

+#RCFLAGS += -DMOZ_STATIC_BUILD

Did you mean to keep this in?

Have you built this with a static build?

Have you built this on Win32?

Comment 3

[Mike Kaply [:mkaply]]

win32 shmin32

building static now

Comment 4

[Mike Kaply [:mkaply]]

Attachment: More fix

We do still need the include on the RC line for the static build.

Also, I discovered that G++ supports passing the .res file on the link line, so
we've been binding our resources twice.

I was able to remove the RES bind rules from rules.mk to remedy this.

Comment 5

[Mike Kaply [:mkaply]]

Fix checked in - I didn't do the Windows change, I just did the OS/2 changes.