mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
OS/2 updates for firefox static build
This commit is contained in:
parent
c42ea21330
commit
c23d9287f3
@ -130,11 +130,7 @@ ifeq ($(OS_ARCH),OS2)
|
||||
RESFILE=splashos2.res
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
EXE_DEF_FILE = browser.def
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OS_LIBS += libuls.lib libconv.lib
|
||||
else
|
||||
OS_LIBS += -llibuni -luconv
|
||||
endif
|
||||
RCFLAGS += -d MOZ_STATIC_BUILD -i $(DIST)/include/widget
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -185,7 +181,7 @@ $(EXE_DEF_FILE):
|
||||
@echo WinRemoveProperty = PMMERGE.5451 >>$(EXE_DEF_FILE)
|
||||
@echo WinSetProperty = PMMERGE.5452 >>$(EXE_DEF_FILE)
|
||||
|
||||
LDFLAGS += /NOE
|
||||
LDFLAGS += -Zlinker /NOE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -48,3 +48,31 @@ STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
ID_DDE_APPLICATION_NAME, "Firefox"
|
||||
END
|
||||
|
||||
#ifdef MOZ_STATIC_BUILD
|
||||
#include "wdgtos2rc.h"
|
||||
|
||||
POINTER IDC_SELECTANCHOR "..\\..\\widget\\src\\os2\\res\\\select.ptr"
|
||||
POINTER IDC_ARROWNORTH "..\\..\\widget\\src\\os2\\res\\arrow_north.ptr"
|
||||
POINTER IDC_ARROWNORTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_north_plus.ptr"
|
||||
POINTER IDC_ARROWSOUTH "..\\..\\widget\\src\\os2\\res\\arrow_south.ptr"
|
||||
POINTER IDC_ARROWSOUTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_south_plus.ptr"
|
||||
POINTER IDC_ARROWWEST "..\\..\\widget\\src\\os2\\res\\arrow_west.ptr"
|
||||
POINTER IDC_ARROWWESTPLUS "..\\..\\widget\\src\\os2\\res\\arrow_west_plus.ptr"
|
||||
POINTER IDC_ARROWEAST "..\\..\\widget\\src\\os2\\res\\arrow_east.ptr"
|
||||
POINTER IDC_ARROWEASTPLUS "..\\..\\widget\\src\\os2\\res\\arrow_east_plus.ptr"
|
||||
POINTER IDC_GRAB "..\\..\\widget\\src\\os2\\res\\grab.ptr"
|
||||
POINTER IDC_GRABBING "..\\..\\widget\\src\\os2\\res\\grabbing.ptr"
|
||||
POINTER IDC_CELL "..\\..\\widget\\src\\os2\\res\\cell.ptr"
|
||||
POINTER IDC_COPY "..\\..\\widget\\src\\os2\\res\\copy.ptr"
|
||||
POINTER IDC_ALIAS "..\\..\\widget\\src\\os2\\res\\aliasb.ptr"
|
||||
POINTER IDC_ZOOMIN "..\\..\\widget\\src\\os2\\res\\zoom_in.ptr"
|
||||
POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
|
||||
|
||||
POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
|
||||
POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
|
||||
POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr"
|
||||
|
||||
ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
|
||||
ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user