forked from mirrors/gecko-dev
Can't use -lXUL on mac (that looks for .dylib), so specify the file manually
This commit is contained in:
parent
f7b8da45f0
commit
1da895f681
4 changed files with 9 additions and 4 deletions
|
|
@ -75,7 +75,7 @@ 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)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
LIBS += -lXUL
|
LIBS += $(DIST)/bin/XUL
|
||||||
else
|
else
|
||||||
EXTRA_DSO_LIBS += xul
|
EXTRA_DSO_LIBS += xul
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ 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)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
LIBS += -lXUL
|
LIBS += $(DIST)/bin/XUL
|
||||||
else
|
else
|
||||||
EXTRA_DSO_LIBS += xul
|
EXTRA_DSO_LIBS += xul
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ 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)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
LIBS += -lXUL
|
LIBS += $(DIST)/bin/XUL
|
||||||
else
|
else
|
||||||
EXTRA_DSO_LIBS += xul
|
EXTRA_DSO_LIBS += xul
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -90,10 +90,15 @@ LOCAL_INCLUDES += \
|
||||||
|
|
||||||
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)
|
||||||
LIBS += -lXUL
|
endif
|
||||||
|
|
||||||
|
ifndef MOZ_ENABLE_LIBXUL
|
||||||
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
LIBS += $(DIST)/bin/XUL
|
||||||
else
|
else
|
||||||
EXTRA_DSO_LIBS += xul
|
EXTRA_DSO_LIBS += xul
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
LIBS += \
|
LIBS += \
|
||||||
$(EXTRA_DSO_LIBS) \
|
$(EXTRA_DSO_LIBS) \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue