From: Luca Barbieri <luca@luca-barbieri.com>
Date: Tue, 21 Sep 2010 13:39:42 +0000 (+0200)
Subject: d3d1x: fix compilation with recent Wine versions installed
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb7cc36fff63e1bbdf4820538a8133f150541be4;p=mesa.git

d3d1x: fix compilation with recent Wine versions installed

Recent Wine versions provide a d3d11shader.h, which is however empty
and was getting used instead of our non-empty one.

Correct the include path order to fix this.
---

diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
index 6ac74d1895f..8c8e2fb445f 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
+++ b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
@@ -1,6 +1,6 @@
 LIBNAME=d3d1xshader
 CPP_SOURCES=$(wildcard src/*.cpp)
-LIBRARY_INCLUDES=-Iinclude -I../w32api -I../d3dapi
+LIBRARY_INCLUDES=-Iinclude -I../d3dapi -I../w32api
 PROGS=tools/fxdis
 LIBS=libd3d1xshader.a