Bug 837235 - Fix builds with --disable-webgl; r=bjacob
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 01 Feb 2013 15:42:15 -0500
changeset 120616 ac2666f2a095cd05c7efb3ddfc4c84133e5dd343
parent 120615 b2ed3a48edbecd2d69b86c0e5955467422126b59
child 120617 4a93c9d94a3b6a0450dd021ae442267dd1e2bd93
push id22328
push usereakhgari@mozilla.com
push dateFri, 01 Feb 2013 20:42:21 +0000
treeherdermozilla-inbound@ac2666f2a095 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs837235
milestone21.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 837235 - Fix builds with --disable-webgl; r=bjacob
content/canvas/src/Makefile.in
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -63,17 +63,16 @@ CPPSRCS += \
 	WebGLShaderPrecisionFormat.cpp \
 	WebGLTexelConversions.cpp \
 	WebGLTexture.cpp \
 	WebGLUniformLocation.cpp \
 	$(NULL)
 
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
-	-I$(topsrcdir)/content/xul/content/src \
 	$(NULL)
 
 else
 
 CPPSRCS += WebGLContextNotSupported.cpp
 
 endif
 
@@ -88,11 +87,12 @@ CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_PI
 INCLUDES	+= \
 		-I$(srcdir)/../../../layout/xul/base/src \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../layout/generic \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		-I$(srcdir)/../../../js/xpconnect/src \
 		-I$(srcdir)/../../../dom/base \
+		-I$(topsrcdir)/content/xul/content/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT