flip NO_SECURITY to MOZ_SECURITY, remove NSPR20 hackery in makefile
git-svn-id: svn://10.0.0.236/trunk@13127 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -67,7 +67,7 @@ BINREL_DIST=$(XPDIST)\WIN954.0_DBG.OBJD
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifdef NO_SECURITY
|
||||
!ifndef MOZ_SECURITY
|
||||
HASHLIBS=$(DIST)\lib\secfreenav32.lib
|
||||
!else
|
||||
HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib
|
||||
@@ -78,12 +78,8 @@ LLIBS = $(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
$(HASHLIBS) \
|
||||
$(BINREL_DIST)\lib\watcomfx.lib
|
||||
|
||||
!ifdef NSPR20
|
||||
DEFFILE = $(DLL1NAME).def
|
||||
!else
|
||||
DEFFILE = $(DLLNAME).def
|
||||
!endif
|
||||
!else
|
||||
LLIBS = $(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
$(GLOWDIR)\glowcode.lib \
|
||||
|
||||
Reference in New Issue
Block a user