зеркало из https://github.com/mozilla/gecko-dev.git
OS/2 specific Makefile changes. Bug #34106 a=leaf
This commit is contained in:
Родитель
f621262cee
Коммит
fc8d5ec6e6
|
@ -28,8 +28,7 @@ VPATH = @srcdir@
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
MODULE = raptor
|
MODULE = raptor
|
||||||
OS2_LIBRARYNAME = gfx_os2
|
LIBRARY_NAME = gfx_os2
|
||||||
OS2_IMPLIB = 1
|
|
||||||
|
|
||||||
REQUIRES = util img xpcom raptor dom netlib java js
|
REQUIRES = util img xpcom raptor dom netlib java js
|
||||||
|
|
||||||
|
@ -50,7 +49,19 @@ CPPSRCS = \
|
||||||
|
|
||||||
RES_FILE = $(srcdir)/libprint.res
|
RES_FILE = $(srcdir)/libprint.res
|
||||||
|
|
||||||
OS2_LIBS = nggfx img mozjs mozutil netlib xpcom
|
EXTRA_DSO_LIBS = nggfx img_s mozutil_s
|
||||||
|
|
||||||
|
EXTRA_DSO_LDOPTS = \
|
||||||
|
$(EXTRA_DSO_LIBS) \
|
||||||
|
$(MOZ_JS_LIBS) \
|
||||||
|
$(MOZ_COMPONENT_LIBS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||||
|
OS_LIBS += libconv.lib
|
||||||
|
else
|
||||||
|
OS_LIBS += -luconv
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
@ -58,7 +69,7 @@ DEFINES += -D_IMPL_NS_GFXONXP
|
||||||
|
|
||||||
INCLUDES += -I$(topsrcdir)/gfx/src
|
INCLUDES += -I$(topsrcdir)/gfx/src
|
||||||
|
|
||||||
OS_LIBS += $(NSPR_LIBS) -luconv
|
OS_LIBS += $(NSPR_LIBS)
|
||||||
|
|
||||||
# This adds the resources for the print dialog to the gfxos2 dll.
|
# This adds the resources for the print dialog to the gfxos2 dll.
|
||||||
# I guess eventually we ought to use an xml dialog...
|
# I guess eventually we ought to use an xml dialog...
|
||||||
|
|
|
@ -24,11 +24,9 @@ VPATH = @srcdir@
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
MODULE = locale
|
MODULE = locale
|
||||||
LIBRARY_NAME = nglocale
|
LIBRARY_NAME = nslocale
|
||||||
IS_COMPONENT = 1
|
IS_COMPONENT = 1
|
||||||
OS2_IMPLIB = 1
|
EXTRA_DSO_LIBS = nslocale_s
|
||||||
OS2_LIBRARYNAME = nglocale
|
|
||||||
OS2_LIBS = libuni xpcom ngbase libnslocale_s
|
|
||||||
|
|
||||||
REQUIRES = xpcom unicharutil
|
REQUIRES = xpcom unicharutil
|
||||||
|
|
||||||
|
@ -38,13 +36,22 @@ CPPSRCS = \
|
||||||
nsCollationOS2.cpp \
|
nsCollationOS2.cpp \
|
||||||
nsDateTimeFormatOS2.cpp \
|
nsDateTimeFormatOS2.cpp \
|
||||||
nsLocaleDllOS2.cpp \
|
nsLocaleDllOS2.cpp \
|
||||||
|
nsLocaleModule.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXPORTS = nsILocaleOS2.h
|
EXTRA_DSO_LDOPTS = $(EXTRA_DSO_LIBS) \
|
||||||
|
$(MOZ_COMPONENT_LIBS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||||
|
EXTRA_DSO_LDOPTS += libuls.lib
|
||||||
|
else
|
||||||
|
EXTRA_DSO_LDOPTS += -llibuni
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
INCLUDES += $(srcdir) $(srcdir)/..
|
INCLUDES += $(srcdir)/..
|
||||||
|
|
||||||
OS_LIBS += $(NSPR_LIBS)
|
OS_LIBS += $(NSPR_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,9 @@ VPATH = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
LIBRARY_NAME = widget_os2
|
LIBRARY_NAME = wdgtos2
|
||||||
|
|
||||||
|
EXTRA_DSO_LIBS = nggfx
|
||||||
|
|
||||||
REQUIRES = util img xpcom raptor netlib
|
REQUIRES = util img xpcom raptor netlib
|
||||||
|
|
||||||
|
@ -40,11 +42,9 @@ CPPSRCS = \
|
||||||
nsBaseList.cpp \
|
nsBaseList.cpp \
|
||||||
nsCanvas.cpp \
|
nsCanvas.cpp \
|
||||||
nsCheckbutton.cpp \
|
nsCheckbutton.cpp \
|
||||||
nsClipboard.cpp \
|
|
||||||
nsCombobox.cpp \
|
nsCombobox.cpp \
|
||||||
nsContextMenu.cpp \
|
nsContextMenu.cpp \
|
||||||
nsDirPicker.cpp \
|
nsDirPicker.cpp \
|
||||||
nsDragService.cpp \
|
|
||||||
nsEntryField.cpp \
|
nsEntryField.cpp \
|
||||||
nsFSTree.cpp \
|
nsFSTree.cpp \
|
||||||
nsFileDialog.cpp \
|
nsFileDialog.cpp \
|
||||||
|
@ -62,25 +62,38 @@ CPPSRCS = \
|
||||||
nsRadiobutton.cpp \
|
nsRadiobutton.cpp \
|
||||||
nsScrollbar.cpp \
|
nsScrollbar.cpp \
|
||||||
nsSound.cpp \
|
nsSound.cpp \
|
||||||
nsTabWidget.cpp \
|
|
||||||
nsTextArea.cpp \
|
nsTextArea.cpp \
|
||||||
nsToolkit.cpp \
|
nsToolkit.cpp \
|
||||||
nsTooltipManager.cpp \
|
nsTooltipManager.cpp \
|
||||||
nsTooltipWidget.cpp \
|
|
||||||
nsWidgetFactory.cpp \
|
nsWidgetFactory.cpp \
|
||||||
nsWindow.cpp \
|
nsWindow.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
|
# XXX FILES temporarily removed
|
||||||
|
# nsClipboard.cpp \
|
||||||
|
# nsDragService.cpp \
|
||||||
|
|
||||||
|
# nsITabWidget and nsITooltipWidget appear to have been scrapped
|
||||||
|
# nsTabWidget.cpp \
|
||||||
|
# nsTooltipWidget.cpp \
|
||||||
|
|
||||||
|
SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.$(LIB_SUFFIX)
|
||||||
|
|
||||||
EXTRA_DSO_LDOPTS = \
|
EXTRA_DSO_LDOPTS = \
|
||||||
$(TOOLKIT_DSO_LDOPTS) \
|
|
||||||
$(MKSHLIB_FORCE_ALL) \
|
$(MKSHLIB_FORCE_ALL) \
|
||||||
$(SHARED_LIBRARY_LIBS) \
|
$(SHARED_LIBRARY_LIBS) \
|
||||||
$(MKSHLIB_UNFORCE_ALL) \
|
$(MKSHLIB_UNFORCE_ALL) \
|
||||||
$(TK_LIBS) \
|
$(EXTRA_DSO_LIBS) \
|
||||||
|
$(MOZ_TIMER_LIBS) \
|
||||||
|
$(MOZ_COMPONENT_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||||
|
OS_LIBS += libuls.lib libconv.lib unikbd.lib
|
||||||
|
else
|
||||||
|
OS_LIBS += -llibuni -luconv -lunikbd
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
|
DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
|
||||||
|
|
|
@ -25,15 +25,15 @@ VPATH = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
IS_COMPONENT = 1
|
||||||
MODULE = timer
|
MODULE = timer
|
||||||
LIBRARY_NAME = timer_s
|
LIBRARY_NAME = timer
|
||||||
|
|
||||||
REQUIRES = xpcom
|
REQUIRES = xpcom
|
||||||
|
|
||||||
CPPSRCS = nsTimer.cpp
|
CPPSRCS = nsTimerOS2.cpp
|
||||||
|
|
||||||
override NO_SHARED_LIB=1
|
EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
|
||||||
override NO_STATIC_LIB=
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче