|
@@ -972,9 +972,9 @@ HOST_AR='$(AR)'
|
|
|
HOST_AR_FLAGS='$(AR_FLAGS)'
|
|
|
|
|
|
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
|
|
|
-DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
|
|
|
+DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
|
|
|
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
|
|
-XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -L$(LIBXUL_DIST)/bin -lmozalloc'
|
|
|
+XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxul -L$(LIBXUL_DIST)/bin -lmozalloc'
|
|
|
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
|
|
|
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)'
|
|
@@ -1887,7 +1887,7 @@ case "$target" in
|
|
|
DLL_PREFIX=
|
|
|
DOXYGEN=:
|
|
|
DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE
|
|
|
- DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
|
|
|
+ DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
|
|
|
GARBAGE=
|
|
|
IMPORT_LIB_SUFFIX=lib
|
|
|
LIBS="$LIBS"
|
|
@@ -1965,8 +1965,8 @@ case "$target" in
|
|
|
LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
|
|
|
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)'
|
|
|
MOZ_FIX_LINK_PATHS=
|
|
|
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
|
|
|
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -L$(LIBXUL_DIST)/lib -lmozalloc'
|
|
|
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxul -lxpcom_core -lmozalloc'
|
|
|
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxul -L$(LIBXUL_DIST)/lib -lmozalloc'
|
|
|
DLL_PREFIX=
|
|
|
IMPORT_LIB_SUFFIX=dll.a
|
|
|
else
|
|
@@ -2002,7 +2002,7 @@ case "$target" in
|
|
|
MOZ_OPTIMIZE_FLAGS='-O1'
|
|
|
MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib'
|
|
|
MOZ_FIX_LINK_PATHS=
|
|
|
- DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
|
|
|
+ DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
|
|
|
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib'
|
|
|
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
|
|
|
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
|
|
@@ -2227,7 +2227,7 @@ case "$target" in
|
|
|
MOZ_DEBUG_FLAGS="-g -fno-inline"
|
|
|
MOZ_OPTIMIZE_FLAGS="-O2"
|
|
|
MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
|
|
|
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
|
|
|
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
|
|
|
LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
|
|
|
TARGET_MD_ARCH=os2
|
|
|
MOZ_ENABLE_POSTSCRIPT=
|