Bug 676315 - ANGLE build problem: d3dx9.h not found unless $DXSDK_DIR points to it - r=joe
authorBenoit Jacob <bjacob@mozilla.com>
Wed, 10 Aug 2011 18:25:23 -0400
changeset 74195 9c43ba0259fa1536a8caf18efeb1995a5555ff85
parent 74194 02d5f1c5d43846db72e28cb1d59a809a514d2d6e
child 74196 55b4a5e8b5a35b96f1754b9bcd60cf108fcd96a1
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewersjoe
bugs676315
milestone8.0a1
Bug 676315 - ANGLE build problem: d3dx9.h not found unless $DXSDK_DIR points to it - r=joe In configure, we detect the DXSDK using the windows registry and set MOZ_DIRECTX_SDK_PATH accordingly. This patch fixes a bug whereby we weren't using that to actually find headers, and were relying on the half-universal DXSDK_DIR variable instead, which is not always defined and in case of multiple versions installed may not point to the most recent one.
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -55,17 +55,21 @@ STL_FLAGS=
 ENABLE_CXX_EXCEPTIONS=1
 
 # Since we're building off in our own world, we don't want to have
 # mozilla-config.h and -DMOZILLA_CLIENT automatically included and defined, so
 # we just overwrite OS_COMPILE_C(XX)FLAGS.
 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS)
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
 
-LOCAL_INCLUDES += -I$(srcdir)/../../include -I$(srcdir)/.. -I"$(DXSDK_DIR)/include"
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../../include \
+ -I$(srcdir)/.. \
+ -I"$(DXSDK_DIR)/include" \
+ -I"$(MOZ_DIRECTX_SDK_PATH)/include" \
 
 VPATH += $(srcdir)/.. \
   $(srcdir)/../compiler \
   $(srcdir)/../compiler/preprocessor \
   $(srcdir)/../common \
   $(NULL)
 
 # Translator/compiler first
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -55,17 +55,22 @@ STL_FLAGS=
 ENABLE_CXX_EXCEPTIONS=1
 
 # Since we're building off in our own world, we don't want to have
 # mozilla-config.h and -DMOZILLA_CLIENT automatically included and defined, so
 # we just overwrite OS_COMPILE_C(XX)FLAGS.
 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS)
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
 
-LOCAL_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/.. -I"$(DXSDK_DIR)/include"
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../../include \
+ -I$(srcdir)/.. \
+ -I"$(DXSDK_DIR)/include" \
+ -I"$(MOZ_DIRECTX_SDK_PATH)/include" \
+
 
 VPATH += $(srcdir)/..
 VPATH += $(srcdir)/../compiler
 VPATH += $(srcdir)/../compiler/preprocessor
 VPATH += $(srcdir)/../common
 
 # Translator/compiler first