Bug 885855 - [Build bustage] gfx\2d\RadialGradientEffectD2D1.h(9) : fatal error C1083: Cannot open include file: 'd2d1_1.h': No such file or directory. r=gps, f=InvisibleSmiley, f=Bas
authorJustin Wood <Callek@gmail.com>
Mon, 24 Jun 2013 13:29:09 -0400
changeset 147743 19c05a3d7d3cc7a4395435b579d359af37a440be
parent 147742 e872cb70e71943d67d03bce5bf8e494fc230c988
child 147747 fe684609e72a21a24d4ddc66d3fda7ea8a5d168f
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs885855
milestone24.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 885855 - [Build bustage] gfx\2d\RadialGradientEffectD2D1.h(9) : fatal error C1083: Cannot open include file: 'd2d1_1.h': No such file or directory. r=gps, f=InvisibleSmiley, f=Bas
configure.in
gfx/2d/moz.build
--- a/configure.in
+++ b/configure.in
@@ -709,17 +709,17 @@ case "$target" in
     else
         AC_MSG_RESULT("no")
         AC_MSG_ERROR([You are targeting Windows version 0x$MOZ_WINSDK_TARGETVER, but your SDK only supports up to version $MOZ_WINSDK_MAXVER. Install and use an updated SDK, or target a lower version using --with-windows-version. Alternatively, try running the Windows SDK Configuration Tool and selecting a newer SDK. See https://developer.mozilla.org/En/Windows_SDK_versions for more details on fixing this.])
     fi
     
     AC_DEFINE_UNQUOTED(MOZ_WINSDK_TARGETVER,0x$MOZ_WINSDK_TARGETVER)
     # Definitions matching sdkddkver.h
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
-    AC_DEFINE_UNQUOTED(MOZ_WINSDK_MAXVER,0x$MOZ_WINSDK_MAXVER)
+    AC_DEFINE_UNQUOTED(MOZ_WINSDK_MAXVER,$MOZ_WINSDK_MAXVER)
     AC_SUBST(MOZ_WINSDK_MAXVER)
     ;;
 esac
 
 AC_PROG_CPP
 AC_PROG_CXXCPP
 
 if test -n "$_WIN32_MSVC"; then
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -40,17 +40,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'] >= 06020000:
+    if CONFIG['MOZ_WINSDK_MAXVER'] >= '0x06020000':
         CPP_SOURCES += [
             'RadialGradientEffectD2D1.cpp'
         ]
     if CONFIG['MOZ_ENABLE_SKIA']:
         CPP_SOURCES += [
             'ScaledFontWin.cpp',
         ]