зеркало из https://github.com/mozilla/gecko-dev.git
fix srcdir builds on mac os x, bustage from 378995. b=378995 r=mento
This commit is contained in:
Родитель
8257d49737
Коммит
368c3fa564
|
@ -127,8 +127,6 @@ XPIDLSRCS += \
|
||||||
nsPIWidgetCocoa.idl \
|
nsPIWidgetCocoa.idl \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
GFX_CPPSRCS := $(addprefix $(topsrcdir)/gfx/src/mac/,$(GFX_LCPPSRCS))
|
|
||||||
|
|
||||||
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
|
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
|
||||||
|
|
||||||
EXTRA_DSO_LDOPTS += \
|
EXTRA_DSO_LDOPTS += \
|
||||||
|
@ -140,8 +138,6 @@ EXTRA_DSO_LDOPTS += \
|
||||||
$(MOZ_FIX_LINK_PATHS) \
|
$(MOZ_FIX_LINK_PATHS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
GARBAGE += $(GFX_LCPPSRCS)
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
NIB_FILES = \
|
NIB_FILES = \
|
||||||
|
@ -160,10 +156,6 @@ $(NIB_DEST)/%: $(srcdir)/resources/MainMenu.nib/% $(NIB_DEST)
|
||||||
$(INSTALL) $< $(NIB_DEST)
|
$(INSTALL) $< $(NIB_DEST)
|
||||||
|
|
||||||
RESOURCE = libwidget.rsrc
|
RESOURCE = libwidget.rsrc
|
||||||
RES_SRC = nsMacWidget.r
|
|
||||||
|
|
||||||
export:: $(GFX_CPPSRCS) $(srcdir)/$(RES_SRC)
|
|
||||||
$(INSTALL) $^ .
|
|
||||||
|
|
||||||
# for objdir builds, symlink the cursors dir
|
# for objdir builds, symlink the cursors dir
|
||||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||||
|
@ -175,7 +167,7 @@ endif
|
||||||
export::
|
export::
|
||||||
$(INSTALL) $(srcdir)/cursors $(DIST)/bin/res
|
$(INSTALL) $(srcdir)/cursors $(DIST)/bin/res
|
||||||
|
|
||||||
$(RESOURCE): $(RES_SRC)
|
$(RESOURCE): nsMacWidget.r
|
||||||
/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $< -o $@
|
/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $< -o $@
|
||||||
|
|
||||||
libs:: $(RESOURCE)
|
libs:: $(RESOURCE)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче