Bug 549019 Don't try to build Direct2D with older SDKs (based on patch by bas) r=jrmuizel

gfx/thebes/src/Makefile.in

@@ -64,15 +64,18 @@ CPPSRCS	+= gfxFT2Fonts.cpp \
 	   $(NULL)
 EXTRA_DSO_LDOPTS += ddraw.lib
 else
-CPPSRCS	+= gfxWindowsFonts.cpp \
-	   gfxDWriteFonts.cpp \
+ifdef MOZ_ENABLE_DWRITE_FONT
+CPPSRCS	+= gfxDWriteFonts.cpp \
 	   gfxDWriteTextAnalysis.cpp \
 	   gfxDWriteCommon.cpp \
 	   gfxD2DSurface.cpp \
-	   gfxGDIFontList.cpp \
 	   gfxDWriteFontList.cpp \
 	   $(NULL)
 endif
+CPPSRCS	+= gfxWindowsFonts.cpp \
+	   gfxGDIFontList.cpp \
+	   $(NULL)
+endif
 
 CPPSRCS +=	gfxPDFSurface.cpp
 

gfx/thebes/src/gfxWindowsPlatform.cpp

@@ -64,12 +64,13 @@
 #else
 #include "gfxWindowsFonts.h"
 #include "gfxGDIFontList.h"
-#include "gfxDWriteFontList.h"
+#ifdef CAIRO_HAS_DWRITE_FONT
 #include "gfxDWriteFontList.h"
 #include "gfxDWriteFonts.h"
 #include "gfxDWriteCommon.h"
 #include <dwrite.h>
 #endif
+#endif
 
 #ifdef CAIRO_HAS_D2D_SURFACE
 #include "gfxD2DSurface.h"