wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1252980 - Link the geckolib into libxul and define MOZ_STYLO if --with-servo=PATH is passed. r=gps

Browse Source
This commit is contained in:
Bobby Holley 2015-11-13 22:37:58 -08:00
parent 6f1edf36ac
commit 2d99104d55
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
old-configure.in
View File

@ -7589,6 +7589,27 @@ if test -n "$DISABLE_MOZ_RIL_GEOLOC"; then
fi fi
AC_SUBST(DISABLE_MOZ_RIL_GEOLOC) AC_SUBST(DISABLE_MOZ_RIL_GEOLOC)
dnl ========================================================
dnl = Use the Servo Style System for Gecko.
dnl =
dnl = This linkage setup is temporary, and for experimental
dnl = purposes. We will vendor servo and integrate the build
dnl = systems before actually shipping anything.
dnl ========================================================
MOZ_ARG_WITH_STRING(servo,
[ --with-servo=SERVO_TARGET_DIR
Absolute path of the target directory where libgeckoservo can
be found. This is generally servo_src_dir/target/release.
Passing this flag enables experimental integration with the
servo style system],
SERVO_TARGET_DIR=$withval,
SERVO_TARGET_DIR=)
if test -n "$SERVO_TARGET_DIR"; then
MOZ_SERVO_LIBS="-L${SERVO_TARGET_DIR} -lgeckoservo"
AC_DEFINE(MOZ_STYLO)
AC_SUBST_LIST(MOZ_SERVO_LIBS)
fi
dnl ======================================================== dnl ========================================================
dnl = dnl =
dnl = Misc. Options dnl = Misc. Options

1
toolkit/library/moz.build
View File

@ -212,6 +212,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
if CONFIG['MOZ_NATIVE_JPEG']: if CONFIG['MOZ_NATIVE_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] OS_LIBS += CONFIG['MOZ_JPEG_LIBS']