From 732f1acbcb01393f87fb6419530bb653df7fbf7e Mon Sep 17 00:00:00 2001 From: Dan Glastonbury Date: Tue, 28 Apr 2015 20:41:00 +0200 Subject: [PATCH] Bug 1147447 - Enable STL wrapping for libGLESv2 and libEGL. r=jmuizelaar r=glandium --- gfx/angle/src/libEGL/moz.build | 2 -- gfx/angle/src/libGLESv2/moz.build | 3 --- 2 files changed, 5 deletions(-) diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index faed9e7b21f..6ab700d26dd 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -49,8 +49,6 @@ DEFINES['GL_APICALL'] = "" DEFINES['GL_GLEXT_PROTOTYPES'] = "" DEFINES['EGLAPI'] = "" -# ANGLE uses the STL, so we can't use our derpy STL wrappers. -DISABLE_STL_WRAPPING = True LOCAL_INCLUDES += [ '../../include', '../../src' ] diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build index 4f64833c0b3..5795f3817e6 100644 --- a/gfx/angle/src/libGLESv2/moz.build +++ b/gfx/angle/src/libGLESv2/moz.build @@ -212,13 +212,10 @@ DEFINES['GL_APICALL'] = "" DEFINES['GL_GLEXT_PROTOTYPES'] = "" DEFINES['EGLAPI'] = "" -# ANGLE uses the STL, so we can't use our derpy STL wrappers. -DISABLE_STL_WRAPPING = True LOCAL_INCLUDES += [ '../../include', '../../src' ] - if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: OS_LIBS += [ 'd3d9', 'dxguid' ] else: