Bug 709914 - Slice out the ANGLE compiler from libxul on Windows. r=khuey,a=philor
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 Dec 2011 06:40:23 +0100
changeset 84266 beac1650953419b86ca133e9374d10ec456d2aaa
parent 84265 9a591b2904316d6eff7b38556b5c83c9fac96a1c
child 84267 635b238dfc2ce0df59757fe6048ad61e38fd27b4
child 84270 3f569b3fbc2280f27de328a3e75e7f5cc27659f6
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, philor
bugs709914
milestone11.0a1
first release with
nightly linux32
beac16509534 / 11.0a1 / 20111215031153 / files
nightly linux64
beac16509534 / 11.0a1 / 20111215031153 / files
nightly mac
beac16509534 / 11.0a1 / 20111215031153 / files
nightly win32
beac16509534 / 11.0a1 / 20111215031153 / files
nightly win64
beac16509534 / 11.0a1 / 20111215031153 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 709914 - Slice out the ANGLE compiler from libxul on Windows. r=khuey,a=philor
gfx/angle/Makefile.in
layout/media/Makefile.in
layout/media/symbols.def
toolkit/library/Makefile.in
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -40,17 +40,19 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= angle
 LIBRARY_NAME	= angle
 LIBXUL_LIBRARY  = 1
-EXPORT_LIBRARY  = 1
+ifeq (WINNT,$(OS_TARGET))
+VISIBILITY_FLAGS =
+endif
 
 EXPORTS_NAMESPACES = angle
 
 EXPORTS_angle = \
 	include/GLSLANG/ShaderLang.h \
 	include/GLSLANG/ResourceLimits.h \
 	$(NULL)
 
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -81,13 +81,19 @@ endif
 endif
 
 ifdef MOZ_SYDNEYAUDIO
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libsydneyaudio/src/$(LIB_PREFIX)sydneyaudio.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
+SHARED_LIBRARY_LIBS 	+= \
+	$(DEPTH)/gfx/angle/$(LIB_PREFIX)angle.$(LIB_SUFFIX) \
+	$(NULL)
+
+EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
+
 ifeq (WINNT,$(OS_TARGET))
 DEFFILE = $(srcdir)/symbols.def
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/media/symbols.def
+++ b/layout/media/symbols.def
@@ -72,8 +72,16 @@ vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
 vpx_codec_dec_init_ver
 vpx_codec_decode
 vpx_codec_destroy
 vpx_codec_get_frame
 vpx_codec_peek_stream_info
 vpx_codec_vp8_dx
+ShInitialize
+ShFinalize
+ShGetObjectCode
+ShDestruct
+ShGetInfoLog
+ShCompile
+ShGetInfo
+ShConstructCompiler
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -313,18 +313,16 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 COMPONENT_LIBS += widget_gonk
 endif
 
 STATIC_LIBS += thebes gl ycbcr
 
 COMPONENT_LIBS += profiler
 
-STATIC_LIBS += angle
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += gkwidget
 endif
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += wdgtos2
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_mac