Bug 937224 - Part a: Move LOCAL_INCLUDES to moz.build in gfx/; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 28 Nov 2013 15:10:38 +0100
changeset 157993 4779e661432a87143bdf4659d8012127d34c8419
parent 157992 dc71a9c74cabb9a4833159ba0fd25e1de9e9664d
child 157994 f46cc655a78e30167e57230b17c07aeb7e65f89b
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs937224
milestone28.0a1
Bug 937224 - Part a: Move LOCAL_INCLUDES to moz.build in gfx/; r=mshal
gfx/angle/Makefile.in
gfx/angle/moz.build
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/Makefile.in
gfx/angle/src/libGLESv2/moz.build
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/libpixman/src/Makefile.in
gfx/cairo/libpixman/src/moz.build
gfx/gl/Makefile.in
gfx/gl/moz.build
gfx/harfbuzz/src/Makefile.in
gfx/layers/Makefile.in
gfx/layers/moz.build
gfx/skia/Makefile.in
gfx/skia/moz.build
gfx/tests/gtest/Makefile.in
gfx/tests/gtest/moz.build
gfx/thebes/Makefile.in
gfx/thebes/moz.build
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -4,21 +4,16 @@
 
 # The below is a rough translation of build_angle.gypi:
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
 VPATH += $(srcdir)/src/compiler/preprocessor
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
-LOCAL_INCLUDES += \
-  -I$(srcdir)/include \
-  -I$(srcdir)/include/KHR \
-  -I$(srcdir)/src
-
 VPATH += $(srcdir)/src/compiler
 VPATH += $(srcdir)/src/compiler/depgraph
 VPATH += $(srcdir)/src/compiler/timing
 VPATH += $(srcdir)/src/third_party/compiler
 VPATH += $(srcdir)/src/third_party/murmurhash
 
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -27,17 +27,16 @@ UNIFIED_SOURCES += ['src/compiler/prepro
     'Lexer.cpp',
     'Macro.cpp',
     'MacroExpander.cpp',
     'Preprocessor.cpp',
     'Token.cpp',
     'Tokenizer.cpp',
 ]]
 
-
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
 UNIFIED_SOURCES += ['src/compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
     'CompilerUniform.cpp',
@@ -98,32 +97,37 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
     UNIFIED_SOURCES += [
         'src/compiler/ossource_win.cpp',
     ]
 else:
     UNIFIED_SOURCES += [
         'src/compiler/ossource_posix.cpp',
     ]
 
-
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
 # src/compiler:
 UNIFIED_SOURCES += ['src/compiler/' + src for src in [
     'CodeGenGLSL.cpp',
     'OutputESSL.cpp',
     'OutputGLSL.cpp',
     'OutputGLSLBase.cpp',
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
 ]]
 MSVC_ENABLE_PGO = True
 
+LOCAL_INCLUDES += [
+    'include',
+    'include/KHR',
+    'src',
+]
+
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['ANGLE_DISABLE_TRACE'] = True
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 DEFINES['COMPILER_IMPLEMENTATION'] = True
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -14,32 +14,27 @@ endif
 # mozilla-config.h and -DMOZILLA_CLIENT automatically included and defined, so
 # we just overwrite OS_COMPILE_C(XX)FLAGS.
 OS_COMPILE_CFLAGS   = $(OS_CPPFLAGS)
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
 
 # Below is a transcription of the EGL target from build_angle.gypi.
 # Target: 'libEGL'
 #   Links with: 'libGLESv2'
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../include \
-  -I$(srcdir)/../../include/KHR \
-  -I$(srcdir)/.. \
-  -I$(srcdir)/../libGLESv2 \
-  -I"$(MOZ_DIRECTX_SDK_PATH)/include"
-
 # src/common:
 VPATH += $(srcdir)/../common
 # src/libEGL:
 VPATH += $(srcdir)/../libEGL
 DEFFILE = $(srcdir)/libEGL.def
 RCFILE  = $(srcdir)/libEGL.rc
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include"
+
 #OS_LIBS += $(call EXPAND_LIBNAME,dwmapi)
 
 ifdef GNU_CC
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 OS_LIBS += -ld3d9 -llibGLESv2
 
 else
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -21,16 +21,24 @@ SOURCES += [
     'Surface.cpp',
 ]
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 LIBRARY_NAME = 'libEGL'
 
 FORCE_SHARED_LIB = True
 
+LOCAL_INCLUDES += [
+    '..',
+    '../../include',
+    '../../include/KHR',
+    '../libGLESv2',
+]
+
+
 for var in ('LIBEGL_EXPORTS', 'ANGLE_BUILD', 'NOMINMAX',
             '_CRT_SECURE_NO_DEPRECATE', 'ANGLE_DISABLE_TRACE'):
     DEFINES[var] = True
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -20,22 +20,16 @@ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
 # copied from src/Makefile.in.
 
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
 VPATH += $(srcdir)/../compiler/preprocessor
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
-LOCAL_INCLUDES += \
-  -I$(srcdir)/../../include \
-  -I$(srcdir)/../../include/KHR \
-  -I$(srcdir)/.. \
-  -I"$(MOZ_DIRECTX_SDK_PATH)/include"
-
 VPATH += $(srcdir)/renderer
 VPATH += $(srcdir)/..
 VPATH += $(srcdir)/../compiler
 VPATH += $(srcdir)/../compiler/depgraph
 VPATH += $(srcdir)/../compiler/timing
 VPATH += $(srcdir)/../third_party/compiler
 VPATH += $(srcdir)/../third_party/murmurhash
 
@@ -45,16 +39,18 @@ VPATH += $(srcdir)/../common
 # src/common:
 DEFFILE = $(srcdir)/libGLESv2.def
 RCFILE  = $(srcdir)/libGLESv2.rc
 
 # End build_angle.gypi transcription.
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include"
+
 ifdef GNU_CC
 
 TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 OS_LIBS += -ld3d9 -ldxguid
 
 else
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -15,17 +15,16 @@ SOURCES += ['../compiler/preprocessor/' 
     'Lexer.cpp',
     'Macro.cpp',
     'MacroExpander.cpp',
     'Preprocessor.cpp',
     'Token.cpp',
     'Tokenizer.cpp',
 ]]
 
-
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
 SOURCES += ['../compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
     'CompilerUniform.cpp',
@@ -83,31 +82,29 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
     SOURCES += [
         '../compiler/ossource_win.cpp',
     ]
 else:
     SOURCES += [
         '../compiler/ossource_posix.cpp',
     ]
 
-
 # Target: 'translator_hlsl'
 #   Requires: 'translator_common'
 # src/compiler:
 SOURCES += ['../compiler/' + src for src in [
     'CodeGenHLSL.cpp',
     'DetectDiscontinuity.cpp',
     'OutputHLSL.cpp',
     'SearchSymbol.cpp',
     'ShaderLang.cpp',
     'TranslatorHLSL.cpp',
     'UnfoldShortCircuit.cpp',
 ]]
 
-
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
 SOURCES += ['../common/' + src for src in [
     'debug.cpp',
     'RefCountObject.cpp',
 ]]
 
@@ -175,16 +172,23 @@ SOURCES += ['renderer/' + src for src in
     'VertexDeclarationCache.cpp',
 ]]
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 LIBRARY_NAME = 'libGLESv2'
 
 FORCE_SHARED_LIB = True
 
+LOCAL_INCLUDES += [
+    '..',
+    '../../include',
+    '../../include/KHR',
+]
+
+
 for var in ('LIBGLESV2_EXPORTS', 'ANGLE_BUILD', 'NOMINMAX',
             '_CRT_SECURE_NO_DEPRECATE', 'ANGLE_DISABLE_TRACE',
             'COMPILER_IMPLEMENTATION'):
     DEFINES[var] = True
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -16,18 +16,16 @@ endif
 ifdef MOZ_X11
 OS_INCLUDES += $(XCFLAGS)
 endif
 
 ifdef MOZ_ENABLE_CAIRO_FT
 OS_INCLUDES += $(CAIRO_FT_CFLAGS)
 endif
 
-LOCAL_INCLUDES  += -I$(srcdir)
-
 INSTALL_TARGETS += cairo_features
 cairo_features_FILES := cairo-features.h
 cairo_features_DEST = $(DIST)/include/cairo
 cairo_features_TARGET := export
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -88,18 +88,16 @@ DEFINES += -DUSE_ARM_SIMD
 endif
 
 ifdef USE_ARM_NEON_GCC
 CSRCS += pixman-arm-neon.c
 DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfpu=neon
 endif
 
-LOCAL_INCLUDES	+= -I$(srcdir) -I$(srcdir)/../../cairo/src
-
 include $(topsrcdir)/config/rules.mk
 
 # Disable spammy "missing initializer" GCC warning
 ifdef GNU_CC
 CFLAGS += -Wno-missing-field-initializers
 endif # GNU_CC
 
 # special rule for pixman-mmx to get the right cflags
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -56,16 +56,20 @@ SOURCES += [
     'pixman-utils.c',
     'pixman-x86.c',
     'pixman.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
+LOCAL_INCLUDES += [
+    '../../cairo/src',
+]
+
 
 if CONFIG['MOZ_USE_PTHREADS']:
     DEFINES['HAVE_PTHREAD_SETSPECIFIC'] = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['PIXMAN_USE_XP_DLL_TLS_WORKAROUND'] = True
 
 DEFINES['PACKAGE'] = 'mozpixman'
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -1,15 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+include $(topsrcdir)/config/rules.mk
+
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-LOCAL_INCLUDES = -I$(topsrcdir)/widget/gonk
-LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware/include
+CXXFLAGS += -I$(ANDROID_SOURCE)/hardware/libhardware/include
 endif
 
-include $(topsrcdir)/config/rules.mk
-
 DEFINES := $(filter-out -DUNICODE,$(DEFINES))
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 CFLAGS   += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -67,16 +67,17 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     EXPORTS += ['GLContextSkia.h']
     UNIFIED_SOURCES += [
         'GLContextSkia.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     UNIFIED_SOURCES += ['SharedSurfaceGralloc.cpp']
     EXPORTS += ['SharedSurfaceGralloc.h']
+    LOCAL_INCLUDES += ['/widget/gonk']
 
 if gl_provider == 'CGL':
     # This file includes Mac headers that are unfriendly to unified builds,
     # and we have only one .mm file here anyway.
     SOURCES += [
         "GLContextProvider%s.mm" % (gl_provider),
     ]
     EXPORTS += [
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -19,16 +19,13 @@
 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 # ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 # PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
 # Mozilla author(s): Jonathan Kew
 #
 
-LOCAL_INCLUDES  += -I$(srcdir) 
-
-
 include $(topsrcdir)/config/rules.mk
 
 # Cancel the effect of the -DDEBUG macro if present,
 # because harfbuzz uses that name for its own purposes
 COMPILE_CXXFLAGS += -UDEBUG
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -12,18 +12,17 @@ VPATH       = \
   $(srcdir)/d3d9 \
   $(srcdir)/d3d10 \
   $(srcdir)/d3d11 \
   $(srcdir)/ipc \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += \
-        -I$(topsrcdir)/content/events/src \
+CXXFLAGS += \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
         -I$(ANDROID_SOURCE)/frameworks/av/include/media/stagefright \
         -I$(ANDROID_SOURCE)/frameworks/native/include/media/openmax \
         $(NULL)
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -289,13 +289,17 @@ IPDL_SOURCES = [
 ]
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'
 
+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
 if CONFIG['MOZ_DEBUG']:
     DEFINES['D3D_DEBUG_INFO'] = True
 
 if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
     DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -1,37 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-LOCAL_INCLUDES += \
-	-I$(srcdir)/include/core \
-	-I$(srcdir)/include/config \
-	-I$(srcdir)/include/gpu \
-	-I$(srcdir)/include/pipe \
-	-I$(srcdir)/include/ports \
-	-I$(srcdir)/include/images \
-	-I$(srcdir)/include/lazy \
-	-I$(srcdir)/include/utils \
-	-I$(srcdir)/include/utils/mac \
-	-I$(srcdir)/include/utils/win \
-	-I$(srcdir)/include/views \
-	-I$(srcdir)/include/effects \
-	-I$(srcdir)/src/core \
-	-I$(srcdir)/src/image \
-	-I$(srcdir)/src/gpu \
-	-I$(srcdir)/src/gpu/effects \
-	-I$(srcdir)/src/gpu/gl \
-	-I$(srcdir)/src/lazy \
-	-I$(srcdir)/src/utils \
-	-I$(srcdir)/src/utils/android \
-	-I$(srcdir)/src/sfnt \
-	$(NULL)
-
 VPATH += \
 	$(srcdir)/src/core \
 	$(srcdir)/src/gpu \
 	$(srcdir)/src/gpu/effects \
 	$(srcdir)/src/gpu/gl \
 	$(srcdir)/src/image \
 	$(srcdir)/src/images \
 	$(srcdir)/src/lazy \
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -585,16 +585,40 @@ else:
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     SOURCES += [
         'src/opts/memset.arm.S',
     ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
+LOCAL_INCLUDES += [
+    'include/config',
+    'include/core',
+    'include/effects',
+    'include/gpu',
+    'include/images',
+    'include/lazy',
+    'include/pipe',
+    'include/ports',
+    'include/utils',
+    'include/utils/mac',
+    'include/utils/win',
+    'include/views',
+    'src/core',
+    'src/gpu',
+    'src/gpu/effects',
+    'src/gpu/gl',
+    'src/image',
+    'src/lazy',
+    'src/sfnt',
+    'src/utils',
+    'src/utils/android',
+]
+
 
 DEFINES['SK_A32_SHIFT'] = 24
 DEFINES['SK_R32_SHIFT'] = 16
 DEFINES['SK_G32_SHIFT'] = 8
 DEFINES['SK_B32_SHIFT'] = 0
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'cocoa'):
     DEFINES['SK_USE_POSIX_THREADS'] = 1
--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -2,15 +2,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) 
 
 # Create a GTest library
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/gfx/layers \
-  -I$(topsrcdir)/gfx/2d \
-  -I$(topsrcdir)/gfx/2d/unittest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -37,8 +37,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'wind
     ]
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+LOCAL_INCLUDES += [
+    '/gfx/2d',
+    '/gfx/2d/unittest',
+    '/gfx/layers',
+]
+
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -1,16 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-LOCAL_INCLUDES += \
-	-I$(topsrcdir)/content/xml/document/src \
-	$(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES := $(filter-out -DUNICODE,$(DEFINES))
 
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -295,16 +295,20 @@ LIBRARY_NAME = 'thebes'
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'PremultiplyTables.h',
 ]
 
+LOCAL_INCLUDES += [
+    '/content/xml/document/src',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):
         if CONFIG[var]:
             DEFINES[var] = True