Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1134028 - Don't assign flags to file that may not be defined

Browse Source 
The renderer/d3d/d3d11/SwapChain11.cpp source file is only defined if
building on Windows. The generated moz.build was adjusting the .flags
of this file unconditionally. This worked up until now because the
moz.build was only being evaluated on Windows. However, this assumption
no longer holds true after work in bug 1132771 is complete.

Patch the generation script to put .flags adjustment for the file
in question behind the same conditional as the SOURCES assignment.

--HG--
extra : rebase_source : 77becf0be99b5ade809a90ecf7954345d693d81e
This commit is contained in:
Gregory Szorc 2015-02-21 07:26:30 -05:00
parent a45876ed84
commit 3833c920cf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/angle/src/commit.h
View File

@ -1,3 +1,3 @@
#define ANGLE_COMMIT_HASH "180bf375fb42"
#define ANGLE_COMMIT_HASH "040a674b6d67"
#define ANGLE_COMMIT_HASH_SIZE 12
#define ANGLE_COMMIT_DATE "2015-02-05 14:21:03 -0500"
#define ANGLE_COMMIT_DATE "2015-02-18 11:50:36 -0500"

3
gfx/angle/src/libGLESv2/moz.build
View File

@ -234,5 +234,6 @@ 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") }\'']
SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']
if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']