Bug 549019 Don't try to build Direct2D with older SDKs (based on patch by bas) r=jrmuizel
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sat, 27 Feb 2010 16:05:54 +0000
changeset 38782 28d69119620bef57b90c04b3872a88385cde11b9
parent 38781 6710e573583d156b49ce304b888b3579683b0bc1
child 38783 6d21a2262e8061e22f42a71dd97e5a04a9e8eecc
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjrmuizel
bugs549019
milestone1.9.3a2pre
Bug 549019 Don't try to build Direct2D with older SDKs (based on patch by bas) r=jrmuizel
gfx/thebes/src/Makefile.in
gfx/thebes/src/gfxWindowsPlatform.cpp
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -59,23 +59,26 @@ ifdef WINCE
 CPPSRCS	+= gfxFT2Fonts.cpp \
 	   gfxFT2FontBase.cpp \
 	   gfxFT2Utils.cpp \
 	   gfxDDrawSurface.cpp \
 	   gfxFT2FontList.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 \
+	   gfxDWriteFontList.cpp \
+	   $(NULL)
+endif
+CPPSRCS	+= gfxWindowsFonts.cpp \
 	   gfxGDIFontList.cpp \
-	   gfxDWriteFontList.cpp \
 	   $(NULL)
 endif
 
 CPPSRCS +=	gfxPDFSurface.cpp
 
 _OS_LIBS	= usp10 msimg32
 ifdef GNU_CXX
 _OS_LIBS	+= uuid
--- a/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -59,22 +59,23 @@
 #include FT_FREETYPE_H
 #include "gfxFT2Fonts.h"
 #include "gfxFT2FontList.h"
 #include "cairo-ft.h"
 #include "nsAppDirectoryServiceDefs.h"
 #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"
 #endif
 
 #ifdef WINCE
 #include <shlwapi.h>