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

git-svn-id: svn://10.0.0.236/trunk@189490 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mvl%exedo.nl
2006-02-09 18:49:36 +00:00
parent df1f2998b8
commit 12ab3f7ef7

View File

@@ -69,6 +69,9 @@ CPPSRCS = nsCalendarApp.cpp
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
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
@@ -79,6 +82,7 @@ else
EXTRA_DSO_LIBS += xul
endif
endif
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
TK_LIBS := -framework Cocoa $(TK_LIBS)