mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1036894 part 8 - Move most in-tree library linkage information to moz.build, as USE_LIBS. r=gps
This commit is contained in:
Mike Hommey
parent
5c09d7ae19
commit
5659a611dd
@ -16,8 +16,6 @@ LIBS += \
|
||||
-lhardware_legacy \
|
||||
-lhardware \
|
||||
-lcutils \
|
||||
$(DEPTH)/media/libpng/$(LIB_PREFIX)mozpng.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/widget/gonk/libdisplay/$(LIB_PREFIX)display.$(LIB_SUFFIX) \
|
||||
$(MOZ_ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),17 18 19))
|
||||
@ -28,12 +26,6 @@ LIBS += \
|
||||
endif
|
||||
endif
|
||||
|
||||
LIBS += $(JEMALLOC_LIBS)
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
|
||||
LIBS += \
|
||||
-lbinder \
|
||||
|
||||
@ -17,6 +17,11 @@ if not CONFIG['LIBXUL_SDK']:
|
||||
# a console application.
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZCONFIG']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = True
|
||||
|
||||
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
|
||||
@ -39,4 +44,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
|
||||
LDFLAGS += ['-Wl,--export-dynamic']
|
||||
|
||||
USE_LIBS += [
|
||||
'display',
|
||||
'mozpng',
|
||||
]
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'xpcomglue',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -25,10 +25,6 @@ endif #} LIBXUL_SDK
|
||||
|
||||
# Build a binary bootstrapping with XRE_main
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_LINKER
|
||||
LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
@ -50,4 +50,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
USE_LIBS += [
|
||||
'xpcomglue',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -11,8 +11,7 @@ OS_LIBS += $(call EXPAND_LIBNAME,version)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
|
||||
|
||||
@ -23,3 +23,9 @@ LOCAL_INCLUDES += [
|
||||
'../migration/src',
|
||||
'../shell/src',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -264,8 +264,6 @@ ifneq (,$(MOZ_DEBUG)$(MOZ_DEBUG_SYMBOLS))
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
endif
|
||||
|
||||
MOZALLOC_LIB = $(call EXPAND_LIBNAME_PATH,mozalloc,$(DIST)/lib)
|
||||
|
||||
ASFLAGS += $(_DEBUG_ASFLAGS)
|
||||
OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||
@ -586,8 +584,6 @@ SDK_BIN_DIR = $(DIST)/sdk/bin
|
||||
|
||||
DEPENDENCIES = .md
|
||||
|
||||
MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
|
||||
|
||||
ifdef MACOSX_DEPLOYMENT_TARGET
|
||||
export MACOSX_DEPLOYMENT_TARGET
|
||||
endif # MACOSX_DEPLOYMENT_TARGET
|
||||
|
||||
@ -83,7 +83,7 @@ ifdef COMPILE_ENVIRONMENT
|
||||
# which stuff links.
|
||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS)
|
||||
INCLUDES += -I$(DIST)/include/testing
|
||||
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
libs:: $(CPP_UNIT_TESTS) $(call mkdir_deps,$(DIST)/cppunittests)
|
||||
|
||||
87
configure.in
87
configure.in
@ -959,37 +959,10 @@ TARGET_MD_ARCH=unix
|
||||
DIRENT_INO=d_ino
|
||||
MOZ_USER_DIR=".mozilla"
|
||||
|
||||
MOZ_JPEG_CFLAGS=
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/media/libjpeg)'
|
||||
MOZ_BZ2_CFLAGS=
|
||||
MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
|
||||
MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
|
||||
|
||||
MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
|
||||
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
||||
XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
|
||||
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
|
||||
XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
|
||||
|
||||
# These are specially defined on Windows only
|
||||
case "$target" in
|
||||
*-mingw*)
|
||||
XPCOM_STATICRUNTIME_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
|
||||
XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_staticruntime.$(LIB_SUFFIX)'
|
||||
;;
|
||||
*)
|
||||
XPCOM_STATICRUNTIME_GLUE_LDOPTS=$XPCOM_GLUE_LDOPTS
|
||||
XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS=$XPCOM_STANDALONE_GLUE_LDOPTS
|
||||
;;
|
||||
esac
|
||||
|
||||
MOZ_FS_LAYOUT=unix
|
||||
|
||||
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
|
||||
|
||||
USE_DEPENDENT_LIBS=1
|
||||
|
||||
_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
|
||||
@ -2061,7 +2034,6 @@ ia64*-hpux*)
|
||||
MC=mc.exe
|
||||
# certain versions of cygwin's makedepend barf on the
|
||||
# #include <string> vs -I./dist/include/string issue so don't use it
|
||||
XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/lib)'
|
||||
if test -n "$GNU_CC" -o -n "$CLANG_CC"; then
|
||||
CC="$CC -mwindows"
|
||||
CXX="$CXX -mwindows"
|
||||
@ -3023,16 +2995,18 @@ fi
|
||||
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
ICONV_LIBS=
|
||||
|
||||
case $target_os in
|
||||
darwin*|mingw*)
|
||||
;;
|
||||
*)
|
||||
|
||||
AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
|
||||
AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
|
||||
AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
|
||||
AC_CHECK_LIB(c, iconv, [ICONV_LIBS=],
|
||||
AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv"],
|
||||
AC_CHECK_LIB(iconv, libiconv, [ICONV_LIBS="-liconv"])))
|
||||
_SAVE_LIBS=$LIBS
|
||||
LIBS="$LIBS $_ICONV_LIBS"
|
||||
LIBS="$LIBS $ICONV_LIBS"
|
||||
AC_CACHE_CHECK(
|
||||
[for iconv()],
|
||||
ac_cv_func_iconv,
|
||||
@ -3051,8 +3025,7 @@ AC_CACHE_CHECK(
|
||||
)
|
||||
if test "$ac_cv_func_iconv" = "yes"; then
|
||||
AC_DEFINE(HAVE_ICONV)
|
||||
LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
|
||||
LIBICONV="$_ICONV_LIBS"
|
||||
LIBICONV="$ICONV_LIBS"
|
||||
AC_CACHE_CHECK(
|
||||
[for iconv() with const input],
|
||||
ac_cv_func_const_iconv,
|
||||
@ -3079,6 +3052,8 @@ LIBS=$_SAVE_LIBS
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(ICONV_LIBS)
|
||||
|
||||
AM_LANGINFO_CODESET
|
||||
|
||||
AC_LANG_C
|
||||
@ -3625,11 +3600,6 @@ dnl system ZLIB support
|
||||
dnl ========================================================
|
||||
MOZ_ZLIB_CHECK([1.2.3])
|
||||
|
||||
if test "$MOZ_NATIVE_ZLIB" != 1; then
|
||||
MOZ_ZLIB_CFLAGS="-I${_topsrcdir}/modules/zlib/src"
|
||||
MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,'"$MOZ_BUILD_ROOT"'/modules/zlib/src)'
|
||||
fi
|
||||
|
||||
if test "$MOZ_LINKER" = 1 -a "$MOZ_NATIVE_ZLIB" != 1; then
|
||||
AC_MSG_ERROR([Custom dynamic linker requires --with-system-zlib])
|
||||
fi
|
||||
@ -3760,10 +3730,6 @@ dnl system libffi Support
|
||||
dnl ========================================================
|
||||
MOZ_CONFIG_FFI()
|
||||
|
||||
if test -n "$MOZ_NATIVE_FFI"; then
|
||||
MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS"
|
||||
fi
|
||||
|
||||
# split JS out by default to avoid VS2005 PGO crash (bug 591836).
|
||||
if test "$OS_ARCH" = "WINNT"; then
|
||||
JS_SHARED_LIBRARY=1
|
||||
@ -4247,7 +4213,6 @@ cairo-cocoa)
|
||||
TK_CFLAGS="-DNO_X11"
|
||||
CFLAGS="$CFLAGS $TK_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
|
||||
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL $(call EXPAND_LIBNAME_PATH,mozalloc,$(LIBXUL_DIST)/bin)'
|
||||
MOZ_USER_DIR="Mozilla"
|
||||
MOZ_FS_LAYOUT=bundle
|
||||
MOZ_WEBGL=1
|
||||
@ -4262,7 +4227,6 @@ cairo-uikit)
|
||||
TK_LIBS='-framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreText'
|
||||
CFLAGS="$CFLAGS $TK_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
|
||||
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/bin/XUL $(call EXPAND_LIBNAME_PATH,mozalloc,$(LIBXUL_DIST)/bin)'
|
||||
MOZ_USER_DIR="Mozilla"
|
||||
MOZ_FS_LAYOUT=bundle
|
||||
;;
|
||||
@ -4278,7 +4242,6 @@ cairo-android)
|
||||
;;
|
||||
|
||||
cairo-gonk)
|
||||
XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/lib)'
|
||||
AC_DEFINE(MOZ_WIDGET_GONK)
|
||||
AC_DEFINE(MOZ_TOUCH)
|
||||
MOZ_WIDGET_TOOLKIT=gonk
|
||||
@ -6475,11 +6438,8 @@ MOZ_ARG_ENABLE_BOOL(system-sqlite,
|
||||
MOZ_NATIVE_SQLITE=1,
|
||||
MOZ_NATIVE_SQLITE= )
|
||||
|
||||
if test -z "$MOZ_NATIVE_SQLITE"
|
||||
if test -n "$MOZ_NATIVE_SQLITE"
|
||||
then
|
||||
SQLITE_CFLAGS=
|
||||
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
|
||||
else
|
||||
dnl ============================
|
||||
dnl === SQLite Version check ===
|
||||
dnl ============================
|
||||
@ -7844,9 +7804,6 @@ dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Static build options)
|
||||
|
||||
AC_SUBST(LIBXUL_LIBS)
|
||||
XPCOM_LIBS="$LIBXUL_LIBS"
|
||||
|
||||
if test "$OS_ARCH" = "WINNT"; then
|
||||
GKMEDIAS_SHARED_LIBRARY=1
|
||||
AC_DEFINE(GKMEDIAS_SHARED_LIBRARY)
|
||||
@ -8019,8 +7976,6 @@ fi
|
||||
|
||||
if test "$MOZ_TREE_PIXMAN"; then
|
||||
AC_DEFINE(MOZ_TREE_PIXMAN)
|
||||
MOZ_PIXMAN_CFLAGS=""
|
||||
MOZ_PIXMAN_LIBS='$(call EXPAND_LIBNAME_PATH,mozlibpixman,$(DEPTH)/gfx/cairo/libpixman/src)'
|
||||
else
|
||||
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.19.2)
|
||||
MOZ_PIXMAN_CFLAGS="$PIXMAN_CFLAGS"
|
||||
@ -8397,7 +8352,6 @@ AC_SUBST(MOZ_UPDATE_XTERM)
|
||||
AC_SUBST(MOZ_AUTH_EXTENSION)
|
||||
AC_SUBST(MOZ_PERMISSIONS)
|
||||
AC_SUBST(MOZ_PREF_EXTENSIONS)
|
||||
AC_SUBST(MOZ_JS_LIBS)
|
||||
AC_SUBST(MOZ_DEBUG)
|
||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||
AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
|
||||
@ -8473,12 +8427,6 @@ AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
|
||||
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
|
||||
|
||||
AC_SUBST(MOZ_FIX_LINK_PATHS)
|
||||
AC_SUBST(XPCOM_LIBS)
|
||||
AC_SUBST(XPCOM_FROZEN_LDOPTS)
|
||||
AC_SUBST(XPCOM_GLUE_LDOPTS)
|
||||
AC_SUBST(XPCOM_STANDALONE_GLUE_LDOPTS)
|
||||
AC_SUBST(XPCOM_STATICRUNTIME_GLUE_LDOPTS)
|
||||
AC_SUBST(XPCOM_STANDALONE_STATICRUNTIME_GLUE_LDOPTS)
|
||||
|
||||
AC_SUBST(USE_DEPENDENT_LIBS)
|
||||
|
||||
@ -8934,14 +8882,7 @@ fi
|
||||
|
||||
MOZ_CONFIG_ICU()
|
||||
|
||||
if test -n "$MOZ_NATIVE_ICU"; then
|
||||
MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
|
||||
fi
|
||||
|
||||
if test -n "$JS_SHARED_LIBRARY"; then
|
||||
MOZ_JS_LIBS="$MOZ_JS_SHARED_LIBS"
|
||||
else
|
||||
MOZ_JS_LIBS="$MOZ_JS_STATIC_LIBS"
|
||||
if test -z "$JS_SHARED_LIBRARY"; then
|
||||
AC_DEFINE(MOZ_STATIC_JS)
|
||||
fi
|
||||
AC_SUBST(JS_SHARED_LIBRARY)
|
||||
@ -9055,7 +8996,11 @@ if test "$MOZ_TREE_FREETYPE"; then
|
||||
export LDFLAGS="$LDFLAGS $MOZ_DEBUG_LDFLAGS"
|
||||
# Spaces in the *_CFLAGS and *_LIBS variables are intentionally placed
|
||||
# to force freetype to use our settings rather than autodetecting
|
||||
export LIBPNG_CFLAGS="$MOZ_PNG_CFLAGS "
|
||||
if test -n "$MOZ_NATIVE_PNG"; then
|
||||
export LIBPNG_CFLAGS="$MOZ_PNG_CFLAGS "
|
||||
else
|
||||
export LIBPNG_CFLAGS="-I$_objdir/dist/include"
|
||||
fi
|
||||
export LIBPNG_LIBS="$MOZ_PNG_LIBS "
|
||||
export ZLIB_CFLAGS="$MOZ_ZLIB_CFLAGS "
|
||||
export ZLIB_LIBS="$MOZ_ZLIB_LIBS "
|
||||
|
||||
@ -43,3 +43,8 @@ MOCHITEST_CHROME_MANIFESTS += [
|
||||
|
||||
BROWSER_CHROME_MANIFESTS += ['browser.ini']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -16,3 +16,8 @@ LOCAL_INCLUDES += [
|
||||
'../src',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -16,3 +16,8 @@ LOCAL_INCLUDES += [
|
||||
'..',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -16,3 +16,8 @@ LOCAL_INCLUDES += [
|
||||
'..',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -17,3 +17,8 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -12,3 +12,8 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -27,11 +27,6 @@
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
LIBS = \
|
||||
$(DEPTH)/profile/dirserviceprovider/src/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -33,3 +33,8 @@ else:
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
USE_LIBS += [
|
||||
'profdirserviceprovidersa_s',
|
||||
'xpcomglue',
|
||||
]
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
|
||||
LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_GNOMEVFS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -16,3 +16,9 @@ IS_COMPONENT = True
|
||||
# application. this is necessary since we don't want to force users
|
||||
# to install gnome-vfs2 in order to use the rest of mozilla ;-)
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -52,7 +52,7 @@ DISABLE_STL_WRAPPING = True
|
||||
|
||||
|
||||
LOCAL_INCLUDES += [ '../../include', '../../src' ]
|
||||
EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ]
|
||||
USE_LIBS += [ 'libGLESv2' ]
|
||||
|
||||
LIBRARY_NAME = 'libEGL'
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
@ -14,3 +14,8 @@ LOCAL_INCLUDES += [
|
||||
'../public',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,9 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -20,3 +20,18 @@ LOCAL_INCLUDES += [
|
||||
]
|
||||
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'unicharutil_external_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
USE_LIBS += [
|
||||
'xpcomglue_staticruntime_s',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'xpcomglue_s',
|
||||
]
|
||||
|
||||
@ -10,7 +10,6 @@ ifeq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
WRAP_LDFLAGS =
|
||||
else
|
||||
LIBS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
@ -40,7 +39,6 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT) #{
|
||||
|
||||
LIBS += ../../security/sandbox/$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX)
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
# Note the manifest file exists in the tree, so we use the explicit filename
|
||||
|
||||
@ -15,6 +15,11 @@ else:
|
||||
SOURCES += [
|
||||
'MozillaRuntimeMain.cpp',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
@ -29,6 +34,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
'/security/sandbox',
|
||||
'/security/sandbox/chromium',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'sandbox_s',
|
||||
]
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
# Always enter a Windows program through wmain, whether or not we're
|
||||
|
||||
@ -4,9 +4,7 @@
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(LIBXUL_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -18,3 +18,9 @@ LOCAL_INCLUDES += [
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -15,17 +15,10 @@ endif
|
||||
TOPLEVEL_BUILD := 1
|
||||
|
||||
run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
|
||||
LIBS = $(NSPR_LIBS)
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
DIST_INSTALL = 1
|
||||
|
||||
ifdef JS_STANDALONE
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef JS_HAS_CTYPES
|
||||
ifdef MOZ_NATIVE_FFI
|
||||
LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
|
||||
|
||||
@ -767,8 +767,6 @@ MOZ_USER_DIR=".mozilla"
|
||||
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
||||
|
||||
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
|
||||
|
||||
USE_DEPENDENT_LIBS=1
|
||||
|
||||
_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
|
||||
@ -1679,7 +1677,6 @@ ia64*-hpux*)
|
||||
WARNINGS_AS_ERRORS='-WX'
|
||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||
MOZ_FIX_LINK_PATHS=
|
||||
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
|
||||
# Disable these flags on clang-cl since it doesn't ignore unknown arguments by default, and
|
||||
# autoconf insists on passing $LDFLAGS to the compiler.
|
||||
if test -z "$CLANG_CL"; then
|
||||
@ -1953,7 +1950,7 @@ case "$target" in
|
||||
;;
|
||||
*-solaris*)
|
||||
if test -z "$GNU_CC"; then
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
|
||||
eOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
|
||||
else
|
||||
if test -z "$GCC_USE_GNU_LD"; then
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
|
||||
@ -2772,13 +2769,16 @@ dnl ========================================================
|
||||
dnl system zlib Support
|
||||
dnl ========================================================
|
||||
dnl Standalone js defaults to system zlib
|
||||
ZLIB_DIR=yes
|
||||
if test -n "$JS_STANDALONE"; then
|
||||
ZLIB_DIR=yes
|
||||
fi
|
||||
|
||||
MOZ_ZLIB_CHECK([1.2.3])
|
||||
|
||||
if test -n "$ZLIB_IN_MOZGLUE"; then
|
||||
AC_DEFINE(ZLIB_IN_MOZGLUE)
|
||||
fi
|
||||
AC_SUBST(ZLIB_IN_MOZGLUE)
|
||||
|
||||
dnl ========================================================
|
||||
dnl system libffi Support
|
||||
@ -3615,7 +3615,7 @@ MOZ_ARG_ENABLE_BOOL(readline,
|
||||
JS_WANT_READLINE=1,
|
||||
JS_WANT_READLINE= )
|
||||
|
||||
JS_NATIVE_EDITLINE=
|
||||
JS_BUNDLED_EDITLINE=
|
||||
EDITLINE_LIBS=
|
||||
JS_DISABLE_SHELL=
|
||||
|
||||
@ -3634,14 +3634,13 @@ if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
|
||||
AC_MSG_ERROR([No system readline library found.]))
|
||||
else
|
||||
dnl By default, we use editline
|
||||
JS_NATIVE_EDITLINE=1
|
||||
EDITLINE_LIBS='$(DEPTH)/js/src/editline/$(LIB_PREFIX)editline.$(LIB_SUFFIX)'
|
||||
JS_BUNDLED_EDITLINE=1
|
||||
fi
|
||||
|
||||
dnl Either way, we want to build with line editing support.
|
||||
AC_DEFINE(EDITLINE)
|
||||
fi
|
||||
AC_SUBST(JS_NATIVE_EDITLINE)
|
||||
AC_SUBST(JS_BUNDLED_EDITLINE)
|
||||
AC_SUBST(JS_DISABLE_SHELL)
|
||||
AC_SUBST(EDITLINE_LIBS)
|
||||
|
||||
@ -3731,7 +3730,6 @@ AC_SUBST(ENABLE_STRIP)
|
||||
AC_SUBST(PKG_SKIP_STRIP)
|
||||
AC_SUBST(INCREMENTAL_LINKER)
|
||||
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
|
||||
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
|
||||
|
||||
AC_SUBST(MOZ_FIX_LINK_PATHS)
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
|
||||
LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
|
||||
|
||||
ifdef MOZ_SHARED_ICU
|
||||
EXTRA_LIBS += $(MOZ_ICU_LIBS)
|
||||
|
||||
@ -25,3 +25,7 @@ for var in ('EXPORT_JS_API', 'IMPL_MFBT'):
|
||||
|
||||
LOCAL_INCLUDES += ['..']
|
||||
GENERATED_INCLUDES += ['..']
|
||||
|
||||
USE_LIBS += [
|
||||
'static:js',
|
||||
]
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
|
||||
LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
|
||||
|
||||
ifdef MOZ_SHARED_ICU
|
||||
EXTRA_LIBS += $(MOZ_ICU_LIBS)
|
||||
|
||||
@ -93,3 +93,7 @@ DEFINES['IMPL_MFBT'] = True
|
||||
|
||||
LOCAL_INCLUDES += ['..']
|
||||
GENERATED_INCLUDES += ['..']
|
||||
|
||||
USE_LIBS += [
|
||||
'static:js',
|
||||
]
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
if CONFIG['DEHYDRA_PATH']:
|
||||
DIRS += ['analysis-tests']
|
||||
|
||||
if CONFIG['JS_NATIVE_EDITLINE']:
|
||||
if CONFIG['JS_BUNDLED_EDITLINE']:
|
||||
DIRS += ['editline']
|
||||
|
||||
# editline needs to get built before the shell
|
||||
@ -18,8 +18,6 @@ TEST_DIRS += ['jsapi-tests', 'tests', 'gdb']
|
||||
|
||||
LOCAL_INCLUDES += ['../../mfbt/double-conversion']
|
||||
|
||||
LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
|
||||
|
||||
CONFIGURE_SUBST_FILES += [
|
||||
'devtools/rootAnalysis/Makefile',
|
||||
'js-confdefs.h',
|
||||
@ -29,6 +27,9 @@ CONFIGURE_SUBST_FILES += [
|
||||
|
||||
if CONFIG['JS_STANDALONE']:
|
||||
DEFINES['IMPL_MFBT'] = True
|
||||
USE_LIBS += [
|
||||
'mfbt',
|
||||
]
|
||||
else:
|
||||
CONFIGURE_SUBST_FILES += [
|
||||
'../../config/autoconf-js.mk',
|
||||
@ -426,13 +427,21 @@ HOST_SIMPLE_PROGRAMS += [
|
||||
# In fact, we now build both a static and a shared library, as the
|
||||
# JS shell would like to link to the static library.
|
||||
|
||||
LIBRARY_NAME = 'js'
|
||||
|
||||
if CONFIG['JS_SHARED_LIBRARY']:
|
||||
FORCE_SHARED_LIB = True
|
||||
SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
|
||||
SDK_LIBRARY = True
|
||||
|
||||
FORCE_STATIC_LIB = True
|
||||
STATIC_LIBRARY_NAME = 'js_static'
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ETW']:
|
||||
GENERATED_FILES = [
|
||||
'ETWProvider.h',
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS)
|
||||
LIBS += $(NSPR_LIBS) $(EDITLINE_LIBS) $(MOZ_ZLIB_LIBS)
|
||||
ifdef MOZ_NATIVE_FFI
|
||||
EXTRA_LIBS += $(MOZ_FFI_LIBS)
|
||||
endif
|
||||
|
||||
@ -6,6 +6,9 @@
|
||||
|
||||
if CONFIG['JS_SHELL_NAME']:
|
||||
PROGRAM = CONFIG['JS_SHELL_NAME']
|
||||
if CONFIG['JS_BUNDLED_EDITLINE']:
|
||||
USE_LIBS += ['editline']
|
||||
USE_LIBS += ['static:js']
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'js.cpp',
|
||||
|
||||
@ -5,18 +5,8 @@
|
||||
|
||||
SDK_BINARY = $(PROGRAM)
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(LIBXUL_LIBS) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
ifeq ($(OS_TEST),ia64)
|
||||
LIBS += $(JEMALLOC_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -37,3 +37,9 @@ if CONFIG['_MSC_VER']:
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
RCINCLUDE = 'xpcshell.rc'
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -10,8 +10,7 @@ MANIFEST_PATH = $(testxpcobjdir)/$(componentdir)
|
||||
PP_TARGETS += MANIFEST
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LIB_FILES = $(SHARED_LIBRARY)
|
||||
|
||||
@ -23,3 +23,9 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % (
|
||||
)
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -15,3 +15,8 @@ TEST_TOOL_DIRS += [
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
|
||||
EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32)
|
||||
endif
|
||||
|
||||
|
||||
@ -8,6 +8,9 @@ LIBRARY_NAME = 'gkmedias'
|
||||
|
||||
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WEBRTC']:
|
||||
DIRS += ['webrtc']
|
||||
|
||||
@ -3,29 +3,13 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
# On windows, the WASAPI backend needs the resampler we have in
|
||||
# /media/libspeex_resampler, so we can't get away with just linking cubeb's .o
|
||||
LIBS = $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media) \
|
||||
$(NULL)
|
||||
ifeq ($(OS_TARGET),Darwin)
|
||||
LIBS += -framework AudioUnit -framework CoreAudio
|
||||
else
|
||||
# Otherwise, we can just grab all the compiled .o and compile against that,
|
||||
# linking the appriopriate libraries.
|
||||
LIBS = $(call EXPAND_LIBNAME_PATH,cubeb,$(DEPTH)/media/libcubeb/src)
|
||||
# Don't link gkmedias for it introduces dependencies on Android.
|
||||
ifeq ($(OS_TARGET),Android)
|
||||
LIBS += $(call EXPAND_LIBNAME_PATH,speex,$(DEPTH)/media/libspeex_resampler/src)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET),Darwin)
|
||||
LIBS += -framework AudioUnit -framework CoreAudio
|
||||
ifeq ($(OS_TARGET), OpenBSD)
|
||||
LIBS += -lsndio
|
||||
else
|
||||
ifeq ($(OS_TARGET), OpenBSD)
|
||||
LIBS += -lsndio
|
||||
else
|
||||
LIBS += $(MOZ_ALSA_LIBS) \
|
||||
$(MOZ_PULSEAUDIO_LIBS)
|
||||
endif
|
||||
LIBS += $(MOZ_ALSA_LIBS) \
|
||||
$(MOZ_PULSEAUDIO_LIBS)
|
||||
endif
|
||||
LIBS += $(NULL)
|
||||
endif
|
||||
|
||||
@ -23,3 +23,27 @@ LOCAL_INCLUDES += [
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
# On windows, the WASAPI backend needs the resampler we have in
|
||||
# /media/libspeex_resampler, so we can't get away with just linking cubeb's
|
||||
# .o
|
||||
USE_LIBS += [
|
||||
'gkmedias',
|
||||
]
|
||||
else:
|
||||
# Otherwise, we can just grab all the compiled .o and compile against that,
|
||||
# linking the appriopriate libraries.
|
||||
USE_LIBS += [
|
||||
'cubeb',
|
||||
]
|
||||
# Don't link gkmedias for it introduces dependencies on Android.
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
USE_LIBS += [
|
||||
'speex',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,13 +3,8 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer/$(LIB_PREFIX)nicer.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit/$(LIB_PREFIX)nrappkit.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_NATIVE_NSS
|
||||
@ -23,10 +18,6 @@ LIBS += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_SCTP
|
||||
LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET), Android)
|
||||
LIBS += \
|
||||
$(STLPORT_LDFLAGS) \
|
||||
|
||||
@ -83,3 +83,17 @@ LOCAL_INCLUDES += [
|
||||
'/netwerk/sctp/src/',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/webrtc/trunk/testing/gtest_gtest/gtest',
|
||||
'mozalloc',
|
||||
'mtransport_s',
|
||||
'nicer',
|
||||
'nrappkit',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SCTP']:
|
||||
USE_LIBS += [
|
||||
'nksctp_s',
|
||||
]
|
||||
|
||||
@ -19,13 +19,4 @@ EXTRA_DSO_LDOPTS += \
|
||||
-lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
|
||||
-lhardware -lcutils \
|
||||
$(NULL)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libstagefright \
|
||||
-lstagefright \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \
|
||||
-lvideoeditorplayer \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/froyo/libstagefright \
|
||||
-lstagefright \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \
|
||||
-lstagefright_color_conversion \
|
||||
$(NULL)
|
||||
|
||||
@ -18,6 +18,12 @@ LOCAL_INCLUDES += [
|
||||
'../include/froyo/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/froyo/libstagefright/stagefright',
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
'stagefright_color_conversion',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright \
|
||||
-lstagefright \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \
|
||||
-lstagefright_color_conversion \
|
||||
$(NULL)
|
||||
|
||||
@ -18,6 +18,12 @@ LOCAL_INCLUDES += [
|
||||
'../include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libstagefright/stagefright',
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
'stagefright_color_conversion',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb235/libstagefright \
|
||||
-lstagefright \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libstagefright_color_conversion \
|
||||
-lstagefright_color_conversion \
|
||||
$(NULL)
|
||||
|
||||
@ -18,6 +18,12 @@ LOCAL_INCLUDES += [
|
||||
'../include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
'/media/omx-plugin/lib/gb235/libstagefright/stagefright',
|
||||
'stagefright_color_conversion',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/hc/libstagefright \
|
||||
-lstagefright \
|
||||
$(NULL)
|
||||
|
||||
@ -18,6 +18,11 @@ LOCAL_INCLUDES += [
|
||||
'../include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
'/media/omx-plugin/lib/hc/libstagefright/stagefright',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \
|
||||
-lutils \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libstagefright \
|
||||
-lstagefright \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \
|
||||
-lvideoeditorplayer \
|
||||
$(NULL)
|
||||
|
||||
@ -18,6 +18,12 @@ LOCAL_INCLUDES += [
|
||||
'../include/ics/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/ics/libstagefright/stagefright',
|
||||
'/media/omx-plugin/lib/ics/libutils/utils',
|
||||
'videoeditorplayer',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
$(NULL)
|
||||
@ -19,6 +19,10 @@ LOCAL_INCLUDES += [
|
||||
'/media/omx-plugin/include/froyo/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
$(NULL)
|
||||
@ -19,6 +19,10 @@ LOCAL_INCLUDES += [
|
||||
'/media/omx-plugin/include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
$(NULL)
|
||||
@ -19,6 +19,10 @@ LOCAL_INCLUDES += [
|
||||
'/media/omx-plugin/include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
|
||||
-lutils \
|
||||
$(NULL)
|
||||
@ -19,6 +19,10 @@ LOCAL_INCLUDES += [
|
||||
'/media/omx-plugin/include/gb/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/gb/libutils/utils',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \
|
||||
-lutils \
|
||||
$(NULL)
|
||||
@ -19,6 +19,10 @@ LOCAL_INCLUDES += [
|
||||
'/media/omx-plugin/include/ics/media/stagefright/openmax',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/ics/libutils/utils',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
@ -53,6 +53,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
'hardware/libhardware/include',
|
||||
]
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'/media/omx-plugin/lib/ics/libstagefright/stagefright',
|
||||
'/media/omx-plugin/lib/ics/libutils/utils',
|
||||
'videoeditorplayer',
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -2,31 +2,13 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
LIBS = \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(MOZ_WEBRTC_X11_LIBS) \
|
||||
$(REALTIME_LIBS) \
|
||||
$(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/layout/media/webrtc/$(LIB_PREFIX)webrtc.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/media/libyuv/libyuv_libyuv/$(LIB_PREFIX)yuv.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef BUILD_ARM_NEON
|
||||
LIBS += $(DEPTH)/media/libyuv/libyuv_libyuv_neon/$(LIB_PREFIX)yuv_neon.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifdef JS_SHARED_LIBRARY
|
||||
LIBS += $(MOZ_JS_LIBS)
|
||||
endif
|
||||
|
||||
ifdef MOZ_ALSA
|
||||
LIBS += \
|
||||
$(MOZ_ALSA_LIBS) \
|
||||
@ -96,13 +78,7 @@ LIBS += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET),WINNT)
|
||||
LIBS += \
|
||||
$(DEPTH)/staticlib/components/$(LIB_PREFIX)windowsproxy.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifndef ZLIB_IN_MOZGLUE
|
||||
ifdef MOZ_NATIVE_ZLIB
|
||||
LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
|
||||
@ -92,3 +92,32 @@ if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
|
||||
'/media/mtransport/third_party/nrappkit/src/port/darwin/include',
|
||||
'/media/mtransport/third_party/nrappkit/src/port/generic/include',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'/media/webrtc/signalingtest/signaling_ecc/ecc',
|
||||
'/media/webrtc/signalingtest/signaling_sipcc/sipcc',
|
||||
'/media/webrtc/trunk/testing/gtest_gtest/gtest',
|
||||
'gkmedias',
|
||||
'mozalloc',
|
||||
'mtransport_s',
|
||||
'nksrtp_s',
|
||||
'webrtc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
'yuv',
|
||||
]
|
||||
|
||||
if CONFIG['BUILD_ARM_NEON']:
|
||||
USE_LIBS += [
|
||||
'yuv_neon',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
if CONFIG['JS_SHARED_LIBRARY']:
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
|
||||
@ -6,11 +6,3 @@ STLFLAGS =
|
||||
ifdef MOZ_GLUE_PROGRAM_LDFLAGS
|
||||
DIST_INSTALL = 1
|
||||
endif
|
||||
|
||||
ifdef MOZ_JEMALLOC3
|
||||
ifndef MOZ_NATIVE_JEMALLOC
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
|
||||
endif
|
||||
else
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
|
||||
endif
|
||||
|
||||
@ -38,6 +38,16 @@ if CONFIG['MOZ_REPLACE_MALLOC']:
|
||||
|
||||
LIBRARY_NAME = 'memory'
|
||||
|
||||
if CONFIG['MOZ_JEMALLOC3']:
|
||||
if not CONFIG['MOZ_NATIVE_JEMALLOC']:
|
||||
USE_LIBS += [
|
||||
'jemalloc',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'mozjemalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_GLUE_PROGRAM_LDFLAGS']:
|
||||
SDK_LIBRARY = True
|
||||
|
||||
|
||||
@ -9,3 +9,9 @@ CPP_UNIT_TESTS += [
|
||||
]
|
||||
|
||||
SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -12,7 +12,8 @@ if not CONFIG['MOZ_JEMALLOC3']:
|
||||
SOURCES += [
|
||||
'jemalloc.c',
|
||||
]
|
||||
LIBRARY_NAME = 'jemalloc'
|
||||
LIBRARY_NAME = 'mozjemalloc'
|
||||
STATIC_LIBRARY_NAME = 'jemalloc'
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
# For non release/esr builds, enable (some) fatal jemalloc assertions. This
|
||||
|
||||
@ -2,7 +2,5 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
|
||||
|
||||
MOZ_GLUE_LDFLAGS = # Don't link against mozglue
|
||||
WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
|
||||
|
||||
@ -19,6 +19,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
|
||||
LIBRARY_NAME = 'replace_jemalloc'
|
||||
|
||||
USE_LIBS += [
|
||||
'jemalloc',
|
||||
]
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
DEFINES['MOZ_JEMALLOC3'] = True
|
||||
|
||||
@ -11,6 +11,7 @@ MOZ_GLUE_PROGRAM_LDFLAGS=
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
WRAP_LDFLAGS=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
# Prevent those tests linking against libxpcom, libxul, and nspr.
|
||||
NSPR_LIBS=
|
||||
|
||||
LIBS= $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -48,3 +48,7 @@ if CONFIG['_MSC_VER']:
|
||||
]
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mfbt',
|
||||
]
|
||||
|
||||
@ -17,12 +17,8 @@ HOST_CFLAGS += \
|
||||
$(DEFINES) \
|
||||
$(NULL)
|
||||
|
||||
LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)
|
||||
|
||||
ifdef MOZ_ENABLE_SIGNMAR
|
||||
LIBS += \
|
||||
$(DEPTH)/modules/libmar/sign/$(LIB_PREFIX)signmar.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
|
||||
$(NSPR_LIBS) \
|
||||
|
||||
@ -30,3 +30,13 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
|
||||
LDFLAGS += [
|
||||
'-framework Security',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mar',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ENABLE_SIGNMAR']:
|
||||
USE_LIBS += [
|
||||
'signmar',
|
||||
'verifymar',
|
||||
]
|
||||
|
||||
@ -10,13 +10,9 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
MOZ_GLUE_LDFLAGS = # Don't link against ourselves
|
||||
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
|
||||
|
||||
ifneq (,$(ZLIB_IN_MOZGLUE)$(MOZ_LINKER))
|
||||
ifdef MOZ_NATIVE_ZLIB
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
|
||||
else
|
||||
SHARED_LIBRARY_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@ -68,6 +68,15 @@ if CONFIG['MOZ_ASAN']:
|
||||
|
||||
LIBRARY_NAME = 'mozglue'
|
||||
|
||||
USE_LIBS += [
|
||||
'mfbt',
|
||||
]
|
||||
|
||||
if CONFIG['ZLIB_IN_MOZGLUE'] and not CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
SOURCES += [
|
||||
'cpuacct.c',
|
||||
|
||||
@ -6,8 +6,6 @@ ifdef MOZ_LINKER
|
||||
# Only link against the linker, not mozglue
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker)
|
||||
|
||||
EXTRA_LIBS = $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
|
||||
@ -15,4 +15,7 @@ if CONFIG['MOZ_LINKER']:
|
||||
'TestZip',
|
||||
]
|
||||
LOCAL_INCLUDES += ['../linker']
|
||||
USE_LIBS += [
|
||||
'linker',
|
||||
]
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,9 +3,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -19,3 +19,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
LDFLAGS += ['-mconsole']
|
||||
else:
|
||||
LDFLAGS += ['-SUBSYSTEM:CONSOLE']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
|
||||
|
||||
LIBS = $(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -62,3 +62,9 @@ RESOURCE_FILES += [
|
||||
'urlparse.dat',
|
||||
'urlparse_unx.dat',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,9 +3,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -9,3 +9,9 @@ PROGRAM = 'rdfcat'
|
||||
SOURCES += [
|
||||
'rdfcat.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -9,3 +9,9 @@ PROGRAM = 'rdfpoll'
|
||||
SOURCES += [
|
||||
'rdfpoll.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -3,9 +3,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -9,3 +9,9 @@ PROGRAM = 'triplescat'
|
||||
SOURCES += [
|
||||
'triplescat.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -329,11 +329,8 @@ EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/pr/src/$(LIB_PREFIX)nspr4$(SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/ds/$(LIB_PREFIX)plds4$(SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/libc/src/$(LIB_PREFIX)plc4$(SUFFIX)
|
||||
|
||||
# Fold SQLite
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/db/sqlite3/src/$(LIB_PREFIX)mozsqlite3.$(LIB_SUFFIX)
|
||||
|
||||
# Add all static libraries for nss, smime, ssl and nssutil
|
||||
SHARED_LIBRARY_LIBS = $(addprefix ../,$(NSS_STATIC_LIBS))
|
||||
SHARED_LIBRARY_LIBS += $(addprefix ../,$(NSS_STATIC_LIBS))
|
||||
|
||||
nss_def_file := $(srcdir)/nss.def
|
||||
|
||||
@ -369,7 +366,7 @@ ifdef MOZ_FOLD_LIBS
|
||||
# Force the linker to include everything from the static libraries.
|
||||
EXPAND_LIBS_EXEC += --extract
|
||||
|
||||
$(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS)
|
||||
$(SHARED_LIBRARY): $(addprefix ../,$(NSS_STATIC_LIBS))
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
|
||||
|
||||
|
||||
@ -11,6 +11,10 @@ if CONFIG['MOZ_FOLD_LIBS']:
|
||||
FORCE_SHARED_LIB = True
|
||||
SDK_LIBRARY = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozsqlite3',
|
||||
]
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
DEFFILE = 'nss3.def'
|
||||
|
||||
|
||||
@ -9,3 +9,9 @@ CPP_UNIT_TESTS += [
|
||||
]
|
||||
|
||||
SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul-shared',
|
||||
]
|
||||
|
||||
@ -6,13 +6,9 @@
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
LIBS = \
|
||||
LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(MOZALLOC_LIB) \
|
||||
../../../../../../pkix/$(LIB_PREFIX)mozillapkix.$(LIB_SUFFIX) \
|
||||
../../../../../../pkix/test/lib/$(LIB_PREFIX)pkixtestutil.$(LIB_SUFFIX) \
|
||||
../lib/$(LIB_PREFIX)tlsserver.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += $(TK_CFLAGS)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user