The default bug view has changed. See this FAQ.

ANGLE build problem: d3dx9.h not found unless $DXSDK_DIR points to it, since bug 641630 landed

RESOLVED FIXED

Status

()

Core
Canvas: WebGL
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: bjacob, Unassigned)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

Created attachment 550431 [details] [diff] [review]
fix ANGLE build: find DXSDK headers

As it turns out, our new ANGLE Makefiles only use DXSDK_DIR to look for headers.
Attachment #550431 - Flags: review?(joe)
Comment on attachment 550431 [details] [diff] [review]
fix ANGLE build: find DXSDK headers

Review of attachment 550431 [details] [diff] [review]:
-----------------------------------------------------------------

Is MOZ_DIRECTX_SDK_PATH guaranteed to always be set?

::: gfx/angle/src/libEGL/Makefile.in
@@ +63,5 @@
> +LOCAL_INCLUDES = \
> + -I$(srcdir)/../../include \
> + -I$(srcdir)/.. \
> + -I"$(DXSDK_DIR)/include" \
> + -I"$(MOZ_DIRECTX_SDK_PATH)/include" \

These should be indented two spaces, I think.

::: gfx/angle/src/libGLESv2/Makefile.in
@@ +63,5 @@
> +LOCAL_INCLUDES = \
> + -I$(srcdir)/../../include \
> + -I$(srcdir)/.. \
> + -I"$(DXSDK_DIR)/include" \
> + -I"$(MOZ_DIRECTX_SDK_PATH)/include" \

Same here.
Attachment #550431 - Flags: review?(joe) → review+
(Reporter)

Comment 2

6 years ago
(In reply to comment #1)
> Comment on attachment 550431 [details] [diff] [review] [diff] [details] [review]
> fix ANGLE build: find DXSDK headers
> 
> Review of attachment 550431 [details] [diff] [review] [diff] [details] [review]:
> -----------------------------------------------------------------
> 
> Is MOZ_DIRECTX_SDK_PATH guaranteed to always be set?

Yes. So actually I just realized that checking DXSDK_DIR here is useless and could even cause trouble in case of multiple DXSDKs installed. OK to remove DXSDK_DIR here?

> 
> ::: gfx/angle/src/libEGL/Makefile.in
> @@ +63,5 @@
> > +LOCAL_INCLUDES = \
> > + -I$(srcdir)/../../include \
> > + -I$(srcdir)/.. \
> > + -I"$(DXSDK_DIR)/include" \
> > + -I"$(MOZ_DIRECTX_SDK_PATH)/include" \
> 
> These should be indented two spaces, I think.

I was wondering. If I indent this with two spaces, will these two spaces end up in the command line? That's what I was trying to avoid.
(Reporter)

Comment 3

6 years ago
http://hg.mozilla.org/mozilla-central/rev/9c43ba0259fa
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.