Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 06:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 751431. Rip out Skia from libxul. r=khuey

Browse Source
This commit is contained in:
Nicholas Cameron 2012-05-03 17:15:20 +12:00
parent 0fdb7cc441
commit 782a88280f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/media/Makefile.in
View File

@ -101,9 +101,14 @@ SHARED_LIBRARY_LIBS += \
SHARED_LIBRARY_LIBS += \
$(DEPTH)/gfx/2d/$(LIB_PREFIX)gfx2d.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_ENABLE_SKIA
SHARED_LIBRARY_LIBS += $(MOZ_SKIA_LIBS)
endif
ifeq (WINNT,$(OS_TARGET))
EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
# OTS uses uncompress2() from libz, so we need to link with this
ifdef MOZ_NATIVE_ZLIB

4
toolkit/library/Makefile.in
View File

@ -385,10 +385,6 @@ ifdef HAVE_CLOCK_MONOTONIC
EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
endif
ifdef MOZ_ENABLE_SKIA
EXTRA_DSO_LDOPTS += $(MOZ_SKIA_LIBS)
endif
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -lGLESv2
endif