Bug 1076743 - Fixed angle compilation with mingw. (moz.build part) r=gps
authorJacek Caban <jacek@codeweavers.com>
Mon, 06 Oct 2014 18:03:16 +0200
changeset 232237 0d22e31621232f51226cf2ea108c662002fc5d1c
parent 232236 80bf7cee307ef83fd78583c4f1011b155311d3f6
child 232238 f5a23b027d12af93e8d787a2affac5a1f9e2ec00
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1076743
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1076743 - Fixed angle compilation with mingw. (moz.build part) r=gps
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
@@ -49,14 +49,13 @@ 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' ]
 USE_LIBS += [ 'libGLESv2' ]
-EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ]
 
 SharedLibrary('libEGL')
 
 RCFILE = SRCDIR + '/libEGL.rc'
 DEFFILE = SRCDIR + '/libEGL.def'
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -112,17 +112,16 @@ UNIFIED_SOURCES += [
     'renderer/d3d/d3d9/renderer9_utils.cpp',
     'renderer/d3d/d3d9/RenderTarget9.cpp',
     'renderer/d3d/d3d9/ShaderExecutable9.cpp',
     'renderer/d3d/d3d9/SwapChain9.cpp',
     'renderer/d3d/d3d9/TextureStorage9.cpp',
     'renderer/d3d/d3d9/VertexBuffer9.cpp',
     'renderer/d3d/d3d9/VertexDeclarationCache.cpp',
     'renderer/d3d/DynamicHLSL.cpp',
-    'renderer/d3d/HLSLCompiler.cpp',
     'renderer/d3d/ImageD3D.cpp',
     'renderer/d3d/IndexBuffer.cpp',
     'renderer/d3d/IndexDataManager.cpp',
     'renderer/d3d/MemoryBuffer.cpp',
     'renderer/d3d/ShaderD3D.cpp',
     'renderer/d3d/TextureD3D.cpp',
     'renderer/d3d/TextureStorage.cpp',
     'renderer/d3d/TransformFeedbackD3D.cpp',
@@ -143,16 +142,17 @@ UNIFIED_SOURCES += [
     'validationES2.cpp',
     'validationES3.cpp',
     'VertexArray.cpp',
     'VertexAttribute.cpp',
 ]
 SOURCES += [
     '../compiler/translator/glslang_lex.cpp',
     '../compiler/translator/glslang_tab.cpp',
+    'renderer/d3d/HLSLCompiler.cpp',
     'renderer/loadimageSSE2.cpp',
 ]
 SOURCES['renderer/loadimageSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     UNIFIED_SOURCES += [
         'renderer/d3d/d3d11/Blit11.cpp',
         'renderer/d3d/d3d11/Buffer11.cpp',
         'renderer/d3d/d3d11/Clear11.cpp',
@@ -208,22 +208,22 @@ 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']:
-  EXTRA_DSO_LDOPTS += [ 'd3d9.lib', 'dxguid.lib' ]
+  OS_LIBS += [ 'd3d9', 'dxguid' ]
 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']),
   ]
 
 SharedLibrary('libGLESv2')
 
 RCFILE = SRCDIR + '/libGLESv2.rc'
 DEFFILE = SRCDIR + '/libGLESv2.def'
 
-DEFINES['ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'] = '{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }'
+SOURCES['renderer/d3d/HLSLCompiler.cpp'].flags += ['-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES=\'{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }\'']