Bug 325592. the 1.8 branch needs different linking. r=bsmedberg. Patch by michael.buettner@sun.com and I

This commit is contained in:
mvl%exedo.nl 2006-02-09 18:49:27 +00:00
Родитель 3f1463e49e
Коммит 351b6dd5a8
1 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

@ -69,6 +69,9 @@ CPPSRCS = nsCalendarApp.cpp
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
ifdef MOZILLA_1_8_BRANCH
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
else
ifdef BUILD_STATIC_LIBS ifdef BUILD_STATIC_LIBS
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
@ -79,6 +82,7 @@ else
EXTRA_DSO_LIBS += xul EXTRA_DSO_LIBS += xul
endif endif
endif endif
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
TK_LIBS := -framework Cocoa $(TK_LIBS) TK_LIBS := -framework Cocoa $(TK_LIBS)