mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
suiterunner bustage fix after bug 78081 (same as benjamin did for thunderbird), r=bsmedberg
This commit is contained in:
parent
0cef7cff1d
commit
61dfe9bf97
@ -68,11 +68,11 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
|||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
ifdef _MSC_VER
|
ifdef _MSC_VER
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DIST)/lib/components
|
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
|
||||||
else
|
else
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
|
||||||
endif
|
endif
|
||||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
LIBS += $(DIST)/bin/XUL
|
LIBS += $(DIST)/bin/XUL
|
||||||
@ -191,7 +191,7 @@ LDFLAGS += /HEAP:0x40000
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
$(PROGRAM): $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
|
|
||||||
ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
|
ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
|
||||||
$(MOZ_APP_NAME).1: seamonkey.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
$(MOZ_APP_NAME).1: seamonkey.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||||
|
Loading…
Reference in New Issue
Block a user