Bug 883004 - Part 2: Move Direct2D 1.1 detection to configure.in r=glandium
authorBas Schouten <bschouten@mozilla.com>
Wed, 17 Jul 2013 14:12:05 +0200
changeset 138893 baa536e257122a38bdf4f5162719d8d6dcc7c8fe
parent 138892 e0c9008cb0be554737e3679a32787599e11a609a
child 138894 abf08bdc5e9306814863e191de30615c949c1e83
push id24977
push userryanvm@gmail.com
push dateFri, 19 Jul 2013 00:35:38 +0000
treeherdermozilla-central@0d0263a58f06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs883004
milestone25.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 883004 - Part 2: Move Direct2D 1.1 detection to configure.in r=glandium
configure.in
gfx/2d/moz.build
--- a/configure.in
+++ b/configure.in
@@ -8119,16 +8119,23 @@ fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_GMODULE_LIBS)
 
 dnl ========================================================
 dnl Graphics checks.
 dnl ========================================================
 
+if test "${OS_TARGET}" = "WINNT"; then
+  if $PERL -e "exit($MOZ_WINSDK_MAXVER < 0x06020000)"; then
+    MOZ_ENABLE_DIRECT2D1_1=1
+    AC_SUBST(MOZ_ENABLE_DIRECT2D1_1)
+  fi
+fi
+
 if test "${OS_TARGET}" = "WINNT" -o "${OS_ARCH}" = "Darwin" -o "${MOZ_WIDGET_TOOLKIT}" = "android" -o "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
     case "${target_cpu}" in
     i*86*|x86_64|arm)
         MOZ_ENABLE_SKIA=1
         ;;
     *)
         MOZ_ENABLE_SKIA=
         ;;
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -44,17 +44,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'DrawTargetD2D.cpp',
         'SourceSurfaceD2D.cpp',
         'SourceSurfaceD2DTarget.cpp',
         'PathD2D.cpp',
         'ScaledFontDWrite.cpp',
     ]
-    if CONFIG['MOZ_WINSDK_MAXVER'] >= '0x06020000':
+    if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
         CPP_SOURCES += [
             'RadialGradientEffectD2D1.cpp'
         ]
     if CONFIG['MOZ_ENABLE_SKIA']:
         CPP_SOURCES += [
             'ScaledFontWin.cpp',
         ]