зеркало из https://github.com/mozilla/pjs.git
suiterunner bustage fix after bug 78081 (same as benjamin did for thunderbird), r=bsmedberg
This commit is contained in:
Родитель
b948465a58
Коммит
05b8d859cf
|
@ -68,11 +68,11 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
|||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
ifdef _MSC_VER
|
||||
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DIST)/lib/components
|
||||
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
|
||||
else
|
||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
|
||||
endif
|
||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||
LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||
else
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
LIBS += $(DIST)/bin/XUL
|
||||
|
@ -191,7 +191,7 @@ LDFLAGS += /HEAP:0x40000
|
|||
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)))
|
||||
$(MOZ_APP_NAME).1: seamonkey.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
|
|
Загрузка…
Ссылка в новой задаче