Can't use -lXUL on mac (that looks for .dylib), so specify the file manually

This commit is contained in:
bsmedberg%covad.net 2005-11-23 16:27:49 +00:00
parent f7b8da45f0
commit 1da895f681
4 changed files with 9 additions and 4 deletions

View File

@ -75,7 +75,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
LIBS += -lXUL
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
endif

View File

@ -74,7 +74,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
LIBS += -lXUL
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
endif

View File

@ -73,7 +73,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
LIBS += -lXUL
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
endif

View File

@ -90,10 +90,15 @@ LOCAL_INCLUDES += \
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
TK_LIBS := -framework Cocoa $(TK_LIBS)
LIBS += -lXUL
endif
ifndef MOZ_ENABLE_LIBXUL
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
endif
endif
LIBS += \
$(EXTRA_DSO_LIBS) \