mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-13 03:24:26 +00:00
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.
This commit is contained in:
parent
f81fe059d2
commit
e343a8afa2
@ -60,7 +60,11 @@ ENABLE_CXX_EXCEPTIONS=1
|
||||
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 \
|
||||
|
@ -60,7 +60,12 @@ ENABLE_CXX_EXCEPTIONS=1
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user