Bug 601358 - d3d10 compilation failure without d2d compilation enabled r=bas.schouten a=joe
authorJacek Caban <jacek@codeweavers.com>
Thu, 14 Oct 2010 21:03:20 +0000
changeset 55809 a6e70b28834faabb442e7690bd0e610aa95ca969
parent 55808 49c6997d5e095a3405f20c9c65af72836a50eb04
child 55810 2f23afd0b705cad1dde3ca2519940ebcde6be28a
push idunknown
push userunknown
push dateunknown
reviewersbas, joe
bugs601358
milestone2.0b8pre
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 601358 - d3d10 compilation failure without d2d compilation enabled r=bas.schouten a=joe
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8422,17 +8422,21 @@ if test "$MOZ_TREE_CAIRO"; then
             fi
         else
             WIN32_FONT_FEATURE=
             WIN32_DWRITE_FONT_FEATURE=
             WIN32_D2D_SURFACE_FEATURE=
         fi
 
         AC_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1)
-        AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
+
+        dnl D3D10 Layers depend on D2D Surfaces.
+        if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
+          AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
+        fi
 
         AC_TRY_COMPILE([#include <ddraw.h>], [int foo = DDLOCK_WAITNOTBUSY;], HAS_DDRAW=1, HAS_DDRAW=)
         if test -z "$HAS_DDRAW"; then
             AC_MSG_WARN([DirectDraw ddraw.h header not found or it's missing DDLOCK_WAITNOTBUSY, disabling DirectDraw surface.  If you have an older SDK (such as the CE5 SDK), try copying in ddraw.lib and ddraw.h from the WM6 SDK.])
             DDRAW_SURFACE_FEATURE=
         else
             DDRAW_SURFACE_FEATURE="#define CAIRO_HAS_DDRAW_SURFACE 1"
         fi