Bugzilla bug #27457: prepare the Windows build system for NSPR library
name change. Define a new makefile variable LIBPLC. Modified files: mozilla/config/config.mak mozilla/dom/src/build/makefile.win mozilla/extensions/wallet/cookieviewer/makefile.win mozilla/extensions/wallet/editor/makefile.win mozilla/extensions/wallet/signonviewer/makefile.win mozilla/extensions/wallet/walletpreview/makefile.win mozilla/mailnews/import/eudora/src/makefile.win mozilla/mailnews/import/oexpress/makefile.win mozilla/mailnews/import/outlook/src/makefile.win mozilla/mailnews/import/src/makefile.win mozilla/mailnews/import/text/src/makefile.win mozilla/netwerk/protocol/jar/src/makefile.win mozilla/profile/Acctidl/makefile.win mozilla/profile/src/makefile.win mozilla/xpcom/sample/makefile.win git-svn-id: svn://10.0.0.236/trunk@60875 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -347,7 +347,9 @@ MKCPYFLAGS= -i
|
||||
#// Common Libraries
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LIBNSPR=$(DIST)\lib\nspr3.lib $(DIST)\lib\plds3.lib $(DIST)\lib\plc3.lib
|
||||
NSPR_VERSION=3
|
||||
LIBNSPR=$(DIST)\lib\nspr$(NSPR_VERSION).lib $(DIST)\lib\plds$(NSPR_VERSION).lib $(DIST)\lib\plc$(NSPR_VERSION).lib
|
||||
LIBPLC=$(DIST)\lib\plc$(NSPR_VERSION).lib
|
||||
|
||||
NSPRDIR = nsprpub
|
||||
CFLAGS = $(CFLAGS) -DNSPR20
|
||||
|
||||
@@ -55,8 +55,6 @@ LLIBS= \
|
||||
$(DIST)\lib\gkgfxwin.lib \
|
||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plds3.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(DIST)\lib\caps.lib \
|
||||
$(DIST)\lib\oji.lib \
|
||||
$(DIST)\lib\timer_s.lib \
|
||||
|
||||
@@ -37,7 +37,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
@@ -37,7 +37,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
@@ -37,7 +37,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
@@ -37,7 +37,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
@@ -37,7 +37,6 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -45,7 +45,6 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
LLIBS= $(LLIBS) \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(DIST)\lib\zlib.lib \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
@@ -79,7 +79,7 @@ BINREL_DIST=$(XPDIST)\WIN954.0_DBG.OBJD
|
||||
LLIBS = \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(NULL)
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
|
||||
@@ -36,7 +36,7 @@ CPP_OBJS=\
|
||||
|
||||
LLIBS=\
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\plc3.lib \
|
||||
$(LIBPLC) \
|
||||
$(NULL)
|
||||
|
||||
LINCS=\
|
||||
|
||||
Reference in New Issue
Block a user