mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-20 00:20:37 +00:00
optionally include GlowCode. bug 299200 a:don.
This commit is contained in:
parent
3bdb34ea13
commit
adae25132e
@ -25,6 +25,9 @@ MAKE_OBJ_TYPE = DLL
|
||||
OBJS = $(OBJS)
|
||||
|
||||
LLIBS = $(DIST)\lib\nsdlg$(MOZ_BITS).lib
|
||||
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
!endif
|
||||
|
||||
MODULE = mnrcdll
|
||||
DEPTH = ..\..\..\..
|
||||
|
@ -43,7 +43,11 @@ LLIBS32 = $(LLIBS32) uuid2.lib
|
||||
!endif
|
||||
|
||||
!if "$(MOZ_BITS)" == "32"
|
||||
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS = $(LLIBS) $(LLIBS32) $(GLOWDIR)\glowcode.lib
|
||||
!else
|
||||
LLIBS = $(LLIBS) $(LLIBS32)
|
||||
!endif
|
||||
!else
|
||||
LLIBS = $(LLIBS) $(LLIBS16)
|
||||
!endif
|
||||
|
@ -59,6 +59,10 @@ LLIBS= $(LIBNSPR) \
|
||||
$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
$(DIST)\lib\jrt$(MOZ_BITS)$(VERSION_NUMBER).lib
|
||||
|
||||
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
!endif
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
|
@ -41,6 +41,9 @@ LINCS= \
|
||||
-I$(XPDIST)\public\softupdt \
|
||||
-I$(XPDIST)\public\zlib
|
||||
!endif
|
||||
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
@ -68,4 +71,4 @@ symbols:
|
||||
|
||||
crc32.c: $(DEPTH)/modules/zlib/src/crc32.c
|
||||
@$(RM) $@
|
||||
copy $(DEPTH)\modules\zlib\src\crc32.c $@
|
||||
copy $(DEPTH)\modules\zlib\src\crc32.c $@
|
||||
|
@ -39,6 +39,9 @@ C_OBJS=.\$(OBJDIR)\nspatch.obj
|
||||
!if "$(MOZ_BITS)" != "16"
|
||||
LINCS=-I$(XPDIST)\public\softupdt
|
||||
!endif
|
||||
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
|
@ -35,6 +35,9 @@ C_OBJS=.\$(OBJDIR)\nsunbind.obj
|
||||
!if "$(MOZ_BITS)" != "16"
|
||||
LINCS=-I$(XPDIST)\public\softupdt
|
||||
!endif
|
||||
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
|
||||
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user