mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Add support for building more than one toolkit at once. Currently #ifdefed
off as part of the toolkit link time exorcism.
This commit is contained in:
ramiro%netscape.com
parent
fe7e7976fe
commit
692e429935
@ -203,6 +203,21 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \
|
||||
-DGFXWIN_DLL=\"libgfx_$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
|
||||
$(TK_CFLAGS)
|
||||
|
||||
MOZ_DEFAULT_TOOLKIT = @MOZ_DEFAULT_TOOLKIT@
|
||||
|
||||
MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@
|
||||
MOZ_ENABLE_MOTIF = @MOZ_ENABLE_MOTIF@
|
||||
MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@
|
||||
|
||||
MOZ_GTK_CFLAGS = @MOZ_GTK_CFLAGS@
|
||||
MOZ_GTK_LDFLAGS = @MOZ_GTK_LDFLAGS@
|
||||
|
||||
MOZ_MOTIF_CFLAGS = @MOZ_MOTIF_CFLAGS@
|
||||
MOZ_MOTIF_LDFLAGS = @MOZ_MOTIF_LDFLAGS@
|
||||
|
||||
MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@
|
||||
MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@
|
||||
|
||||
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
|
||||
LIBIDL_LIBS = @LIBIDL_LIBS@
|
||||
|
||||
|
||||
242
configure.in
242
configure.in
@ -780,10 +780,252 @@ then
|
||||
AC_SUBST(MOZ_USING_XLIBRGB)
|
||||
fi
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = --with-gtk =
|
||||
dnl = =
|
||||
dnl = Gtk support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(gtk,
|
||||
[ --with-gtk Enable gtk support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
MOZ_ENABLE_GTK=1
|
||||
else
|
||||
MOZ_ENABLE_GTK=
|
||||
fi
|
||||
])
|
||||
fi
|
||||
|
||||
if test "$MOZ_ENABLE_GTK"
|
||||
then
|
||||
AM_PATH_GTK($GTK_VERSION,,
|
||||
AC_MSG_ERROR(Test for GTK failed.))
|
||||
|
||||
AC_ARG_WITH(static-gtk,
|
||||
[ --with-static-gtk link gtk statically if possible],
|
||||
sysstaticgtk=$withval)
|
||||
|
||||
if test "$sysstaticgtk" != "yes"; then
|
||||
MOZ_GTK_LDFLAGS=$GTK_LIBS
|
||||
else
|
||||
changequote(,)
|
||||
|
||||
GTK_LIBS_LOC=`echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`
|
||||
|
||||
GTK_STATIC_LOC=`echo $GTK_LIBS | sed 's/^ *-L\([^ ]*\) .*$/\1/'`
|
||||
GTK_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(gtk[^ ]*\) .*/\1/'`
|
||||
GDK_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(gdk[^ ]*\) .*/\1/'`
|
||||
|
||||
GLIB_STATIC_LOC=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *-L\([^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
|
||||
if test ! "$GLIB_STATIC_LOC" ; then
|
||||
GLIB_STATIC_LOC=$GTK_STATIC_LOC
|
||||
fi
|
||||
GMODULE_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(gmodule[^ ]*\) .*/\1/'`
|
||||
GLIB_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(glib[^ ]*\) .*/\1/'`
|
||||
|
||||
GTK_OTHER_LIBS=`echo $GTK_LIBS | sed 's/^.*-lglib *\(.*\)/\1/'`
|
||||
|
||||
changequote([,])
|
||||
|
||||
MOZ_GTK_LDFLAGS="$GTK_STATIC_LOC/lib${GTK_STATIC}.a"
|
||||
MOZ_GTK_LDFLAGS="$MOZ_GTK_LDFLAGS $GTK_STATIC_LOC/lib${GDK_STATIC}.a"
|
||||
MOZ_GTK_LDFLAGS="$MOZ_GTK_LDFLAGS $GLIB_STATIC_LOC/lib${GMODULE_STATIC}.a"
|
||||
MOZ_GTK_LDFLAGS="$MOZ_GTK_LDFLAGS $GLIB_STATIC_LOC/lib${GLIB_STATIC}.a"
|
||||
MOZ_GTK_LDFLAGS="$MOZ_GTK_LDFLAGS $GTK_LIBS_LOC $GTK_OTHER_LIBS"
|
||||
fi
|
||||
|
||||
MOZ_GTK_CFLAGS=$GTK_CFLAGS
|
||||
fi
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = End Gtk support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = --with-motif =
|
||||
dnl = =
|
||||
dnl = Motif support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(motif,
|
||||
[ --with-motif Enable motif support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
MOZ_ENABLE_MOTIF=1
|
||||
else
|
||||
MOZ_ENABLE_MOTIF=
|
||||
fi
|
||||
])
|
||||
fi
|
||||
|
||||
if test "$MOZ_ENABLE_MOTIF"
|
||||
then
|
||||
AC_MSG_CHECKING(for motif insanity)
|
||||
|
||||
if test "$x_includes"
|
||||
then
|
||||
MOTIF_XINCS="-xif -I$x_includes"
|
||||
fi
|
||||
|
||||
detect_motif="${srcdir}/config/mkdetect/detect_motif.sh -cc $CC $MOTIF_XINCS"
|
||||
MOTIF_VERSION=`${detect_motif}`
|
||||
MOTIF_INCLUDES=`${detect_motif} -if`
|
||||
MOTIF_STATIC_FLAGS=`${detect_motif} -sf`
|
||||
MOTIF_DYNAMIC_FLAGS=`${detect_motif} -df`
|
||||
MOTIF_DYNAMIC_PATHS=`${detect_motif} -dp`
|
||||
dnl MOTIF_REQUIRES_XPM=`${detect_motif} -xpm`
|
||||
MOTIF_REQUIRES_XPM="False"
|
||||
|
||||
${srcdir}/config/mkdetect/detect_motif.sh --cleanup
|
||||
|
||||
if test "$MOTIF_REQUIRES_XPM" = "True" -o "$MOTIF_VERSION" = "2.1"
|
||||
then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
fi
|
||||
|
||||
if test "$MOTIF_REQUIRES_XPM" = "True"
|
||||
then
|
||||
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
|
||||
XPM_LIBS="-lXpm",
|
||||
[MISSING_MOTIF="$MISSING_MOTIF -lXpm"], $XLIBS)
|
||||
fi
|
||||
|
||||
if test "$MOTIF_VERSION" = "2.1"
|
||||
then
|
||||
AC_CHECK_LIB(Xp, XpGetPrinterList,
|
||||
MOTIF_XP_LIBS="-lXp",
|
||||
[MISSING_MOTIF="$MISSING_MOTIF -lXp"], $XLIBS)
|
||||
fi
|
||||
|
||||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
|
||||
MOZ_MOTIF_LDFLAGS="$XLDFLAGS $MOZ_MOTIF_LDFLAGS"
|
||||
|
||||
if test "$MOTIF_STATIC_LIB" = "unknown" -a "$MOTIF_DYNAMIC_LIB" = "unknown"
|
||||
then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
fi
|
||||
|
||||
# Get rid of offending error values
|
||||
if test "$MOTIF_DYNAMIC_PATHS" = "unknown"
|
||||
then
|
||||
MOTIF_DYNAMIC_PATHS=
|
||||
fi
|
||||
|
||||
if test "$MOTIF_DYNAMIC_FLAGS" = "unknown"
|
||||
then
|
||||
MOTIF_DYNAMIC_FLAGS=
|
||||
fi
|
||||
|
||||
if test "$MOTIF_STATIC_FLAGS" = "unknown"
|
||||
then
|
||||
MOTIF_STATIC_FLAGS=
|
||||
fi
|
||||
|
||||
if test "$MOTIF_INCLUDE_DIR" = "unknown"
|
||||
then
|
||||
MOTIF_INCLUDE_DIR=
|
||||
fi
|
||||
|
||||
MOZ_MOTIF_LDFLAGS="$MOTIF_XP_LIBS $MOZ_MOTIF_LDFLAGS $X_LIBS $XT_LIBS $XMU_LIBS $XPM_LIBS $XEXT_LIBS $X11_LIBS $XSM_LIBS $XICE_LIBS"
|
||||
|
||||
AC_ARG_WITH(static-motif,
|
||||
[ --with-static-motif link Motif statically if possible],
|
||||
sysstaticmotif=$withval)
|
||||
|
||||
if test "$sysstaticmotif" != "yes"; then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS"
|
||||
AC_CHECK_LIB(Xm, XmStringCreate,
|
||||
MOZ_MOTIF_LDFLAGS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $MOZ_MOTIF_LDFLAGS",
|
||||
[MISSING_MOTIF="$MISSING_MOTIF $MOTIF_DYNAMIC_FLAGS"],
|
||||
$MOTIF_DYNAMIC_PATHS $MOZ_MOTIF_LDFLAGS $XLIBS)
|
||||
LDFLAGS="$_SAVE_LDFLAGS"
|
||||
else
|
||||
AC_CHECK_LIB(Xm, XmStringCreate,
|
||||
MOZ_MOTIF_LDFLAGS="$MOTIF_STATIC_FLAGS $MOZ_MOTIF_LDFLAGS",
|
||||
[MISSING_MOTIF="$MISSING_MOTIF $MOTIF_STATIC_FLAGS"],
|
||||
$MOZ_MOTIF_LDFLAGS $XLIBS)
|
||||
fi
|
||||
|
||||
MOZ_MOTIF_CFLAGS="$MOTIF_INCLUDES"
|
||||
fi
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = End Motif support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = --with-xlib =
|
||||
dnl = =
|
||||
dnl = Xlib support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
if test "$no_x" != "yes"
|
||||
then
|
||||
AC_ARG_WITH(xlib,
|
||||
[ --with-xlib Enable xlib support ],
|
||||
[
|
||||
if test "$withval" = "yes"
|
||||
then
|
||||
MOZ_ENABLE_XLIB=1
|
||||
else
|
||||
MOZ_ENABLE_XLIB=
|
||||
fi
|
||||
])
|
||||
fi
|
||||
|
||||
if test "$MOZ_ENABLE_XLIB"
|
||||
then
|
||||
AC_MSG_CHECKING(for xlib insanity)
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
MOZ_XLIB_CFLAGS="$X_CFLAGS"
|
||||
MOZ_XLIB_LDFLAGS="$XLDFLAGS"
|
||||
MOZ_XLIB_LDFLAGS="$MOZ_XLIB_LDFLAGS $XEXT_LIBS $X11_LIBS"
|
||||
fi
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
dnl = End Xlib support hackery =
|
||||
dnl = =
|
||||
dnl ========================================================
|
||||
|
||||
AC_SUBST(GTK_CONFIG)
|
||||
AC_SUBST(TK_CFLAGS)
|
||||
AC_SUBST(TK_LIBS)
|
||||
|
||||
AC_SUBST(MOZ_ENABLE_GTK)
|
||||
AC_SUBST(MOZ_ENABLE_MOTIF)
|
||||
AC_SUBST(MOZ_ENABLE_XLIB)
|
||||
AC_SUBST(MOZ_ENABLE_GTK)
|
||||
AC_SUBST(MOZ_ENABLE_MOTIF)
|
||||
AC_SUBST(MOZ_ENABLE_XLIB)
|
||||
AC_SUBST(MOZ_GTK_CFLAGS)
|
||||
AC_SUBST(MOZ_GTK_LDFLAGS)
|
||||
AC_SUBST(MOZ_MOTIF_CFLAGS)
|
||||
AC_SUBST(MOZ_MOTIF_LDFLAGS)
|
||||
AC_SUBST(MOZ_XLIB_CFLAGS)
|
||||
AC_SUBST(MOZ_XLIB_LDFLAGS)
|
||||
AC_SUBST(MOZ_SINGLE_TOOLKIT)
|
||||
|
||||
XCFLAGS="$X_CFLAGS"
|
||||
|
||||
AC_SUBST(XCFLAGS)
|
||||
|
||||
@ -37,7 +37,20 @@ endif
|
||||
DIRS = ps $(XLIB_RGB_DIRS) $(MOZ_GFX_TOOLKIT)
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
DIRS = ps $(XLIB_RGB_DIRS) xlib gtk motif
|
||||
DIRS = ps $(XLIB_RGB_DIRS)
|
||||
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
DIRS += gtk
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_MOTIF
|
||||
DIRS += motif
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
endif
|
||||
|
||||
else
|
||||
DIRS = ps $(XLIB_RGB_DIRS) $(MOZ_GFX_TOOLKIT)
|
||||
endif
|
||||
|
||||
@ -22,18 +22,12 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
LIBRARY_NAME = gfx_gtk
|
||||
|
||||
MODULE=raptor
|
||||
|
||||
REQUIRES=util img xpcom raptor netlib ps
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXNONXP
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
|
||||
CPPSRCS = \
|
||||
nsDeviceContextGTK.cpp \
|
||||
nsDeviceContextSpecFactoryG.cpp \
|
||||
@ -51,9 +45,24 @@ CSRCS = \
|
||||
nsPrintdGTK.c
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
CFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
CFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXNONXP
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/. \
|
||||
-I$(srcdir)/.. \
|
||||
$(NULL)
|
||||
|
||||
@ -36,19 +36,23 @@ CPPSRCS = \
|
||||
nsImageMotif.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(TK_LIBS)
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LIBS += \
|
||||
-L$(DIST)/bin \
|
||||
-lxpcom \
|
||||
-lraptorgfx \
|
||||
-lmozreg \
|
||||
$(NSPR_LIBS) \
|
||||
$(XLDFLAGS) \
|
||||
$(XLIBS) \
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXNONXP
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/. \
|
||||
-I$(srcdir)/.. \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXONXP
|
||||
|
||||
|
||||
@ -30,12 +30,6 @@ MODULE=raptor
|
||||
|
||||
REQUIRES=util img xpcom raptor netlib ps
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS)
|
||||
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb -L/usr/X11R6/lib -lXext -lX11
|
||||
|
||||
CPPSRCS =\
|
||||
nsDeviceContextSpecFactoryX.cpp \
|
||||
nsDeviceContextSpecXlib.cpp \
|
||||
@ -48,6 +42,24 @@ CPPSRCS =\
|
||||
nsRenderingContextXlib.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXNONXP
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/. \
|
||||
-I$(srcdir)/.. \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -30,7 +30,21 @@ include $(DEPTH)/config/autoconf.mk
|
||||
## source tree.
|
||||
##
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
DIRS = xpwidgets gtk xlib motif unix_services
|
||||
DIRS = xpwidgets
|
||||
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
DIRS += gtk
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_MOTIF
|
||||
DIRS += motif
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
endif
|
||||
|
||||
DIRS += unix_services
|
||||
else
|
||||
DIRS = xpwidgets $(MOZ_WIDGET_TOOLKIT)
|
||||
endif
|
||||
|
||||
@ -64,12 +64,21 @@ EXTRA_DSO_LDOPTS = \
|
||||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
@ -79,4 +88,3 @@ INCLUDES += \
|
||||
$(NULL)
|
||||
|
||||
$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
|
||||
|
||||
|
||||
@ -26,13 +26,6 @@ LIBRARY_NAME = widget_motif
|
||||
|
||||
REQUIRES=util img xpcom raptor netlib
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
|
||||
DEFINES += \
|
||||
-I$(srcdir)/../xpwidgets \
|
||||
-I$(srcdir)/.
|
||||
|
||||
CPPSRCS = \
|
||||
$(topsrcdir)/widget/src/build/nsWidgetSupport.cpp \
|
||||
nsAppShell.cpp \
|
||||
@ -63,26 +56,35 @@ DIRS =\
|
||||
app_context \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
DEFINES += $(TK_CFLAGS)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libraptorbasewidget_s.a \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS+= \
|
||||
$(TOOLKIT_DSO_LDOPTS) \
|
||||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
$(NULL)
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../xpwidgets \
|
||||
-I$(srcdir)/. \
|
||||
$(NULL)
|
||||
|
||||
$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
|
||||
|
||||
@ -26,12 +26,6 @@ LIBRARY_NAME = widget_xlib
|
||||
|
||||
REQUIRES=util img xpcom raptor netlib
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
DEFINES += \
|
||||
-I$(srcdir)/../xpwidgets \
|
||||
-I$(srcdir)/.
|
||||
|
||||
CPPSRCS = \
|
||||
$(topsrcdir)/widget/src/build/nsWidgetSupport.cpp \
|
||||
nsAppShell.cpp \
|
||||
@ -61,35 +55,39 @@ CPPSRCS = \
|
||||
nsXUtils.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifdef DEBUG_ramiro
|
||||
DEFINES += -DXLIB_WIDGET_NOISY
|
||||
endif
|
||||
|
||||
DIRS =\
|
||||
window_service \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libraptorbasewidget_s.a \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS+= \
|
||||
$(TOOLKIT_DSO_LDOPTS) \
|
||||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
$(NULL)
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb -L/usr/X11R6/lib -lXext -lX11
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
endif
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../xpwidgets \
|
||||
-I$(srcdir)/. \
|
||||
$(NULL)
|
||||
|
||||
$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
|
||||
|
||||
@ -26,8 +26,17 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
|
||||
DIRS = $(MOZ_WIDGET_TOOLKIT)
|
||||
DIRS = gtk motif xlib
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
DIRS += gtk
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_MOTIF
|
||||
DIRS += motif
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
endif
|
||||
|
||||
LIBRARY_NAME = timer_s
|
||||
|
||||
|
||||
@ -26,18 +26,17 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
|
||||
LIBRARY_NAME = timer_gtk
|
||||
IS_COMPONENT=1
|
||||
REQUIRES=xpcom
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
LIBRARY_NAME = timer_gtk
|
||||
IS_COMPONENT = 1
|
||||
REQUIRES = xpcom
|
||||
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
|
||||
|
||||
CPPSRCS = \
|
||||
nsTimerGtk.cpp \
|
||||
nsTimerGtkFactory.cpp \
|
||||
$(NULL)
|
||||
CPPSRCS = \
|
||||
nsTimerGtk.cpp \
|
||||
nsTimerGtkFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
|
||||
@ -26,19 +26,17 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
|
||||
LIBRARY_NAME = timer_motif
|
||||
IS_COMPONENT=1
|
||||
REQUIRES=xpcom
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
LIBRARY_NAME = timer_motif
|
||||
IS_COMPONENT = 1
|
||||
REQUIRES = xpcom
|
||||
INCLUDES += $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
|
||||
|
||||
CPPSRCS = \
|
||||
nsTimerMotif.cpp \
|
||||
nsTimerMotifFactory.cpp \
|
||||
$(NULL)
|
||||
CPPSRCS = \
|
||||
nsTimerMotif.cpp \
|
||||
nsTimerMotifFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
#EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
EXTRA_DSO_LDOPTS += -L/usr/X11R6/lib -lXt -lX11
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_MOTIF_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
|
||||
@ -26,19 +26,17 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef TOOLKIT_EXORCISM
|
||||
|
||||
LIBRARY_NAME = timer_xlib
|
||||
IS_COMPONENT=1
|
||||
REQUIRES=xpcom
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
LIBRARY_NAME = timer_xlib
|
||||
IS_COMPONENT = 1
|
||||
REQUIRES = xpcom
|
||||
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
|
||||
|
||||
CPPSRCS = \
|
||||
nsTimerXlib.cpp \
|
||||
nsTimerXlibFactory.cpp \
|
||||
$(NULL)
|
||||
CPPSRCS = \
|
||||
nsTimerXlib.cpp \
|
||||
nsTimerXlibFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
#EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
EXTRA_DSO_LDOPTS += -L/usr/X11R6/lib -lX11
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_XLIB_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user