Bug 1173683 - Link libEGL and libGLESv2 against mozalloc. r=njn, a=lizzard
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 11 Jun 2015 14:56:00 -0400
changeset 267736 37c99d72de9a10d7b017f90541ec922ad7dcb85e
parent 267735 dde4eeaaa7ad22a0c55cc0f11a927aca2b790b57
child 267737 9b8f7ed4e0d2a93f2b144c9673c58bf2e8ded176
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn, lizzard
bugs1173683
milestone39.0
Bug 1173683 - Link libEGL and libGLESv2 against mozalloc. r=njn, a=lizzard
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -47,14 +47,17 @@ DEFINES['ANGLE_NO_EXCEPTIONS'] = True
 # We need these defined to nothing so that we don't get bogus dllimport declspecs
 DEFINES['GL_APICALL'] = ""
 DEFINES['GL_GLEXT_PROTOTYPES'] = ""
 DEFINES['EGLAPI'] = ""
 
 
 
 LOCAL_INCLUDES += [ '../../include', '../../src' ]
-USE_LIBS += [ 'libGLESv2' ]
+USE_LIBS += [
+    'libGLESv2',
+    'mozalloc',
+]
 
 GeckoSharedLibrary('libEGL', linkage=None)
 
 RCFILE = SRCDIR + '/libEGL.rc'
 DEFFILE = SRCDIR + '/libEGL.def'
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -221,16 +221,20 @@ if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
 else:
   EXTRA_DSO_LDOPTS += [
     '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
     '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
   ]
 
 GeckoSharedLibrary('libGLESv2', linkage=None)
 
+USE_LIBS += [
+    'mozalloc',
+]
+
 RCFILE = SRCDIR + '/libGLESv2.rc'
 DEFFILE = SRCDIR + '/libGLESv2.def'
 
 SOURCES['renderer/d3d/HLSLCompiler.cpp'].flags += ['-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES=\'{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }\'']
 
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']