projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70fed0b)
d3d1x: fix compilation with recent Wine versions installed
authorLuca Barbieri <luca@luca-barbieri.com>
Tue, 21 Sep 2010 13:39:42 +0000 (15:39 +0200)
committerLuca Barbieri <luca@luca-barbieri.com>
Tue, 21 Sep 2010 13:44:41 +0000 (15:44 +0200)
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.

src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile patch | blob | history

diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
index 6ac74d1895f156e21351d7644a4bb11cfb944caf..8c8e2fb445f60ed9bbf738541de4e6b2b51b60f5 100644 (file)
--- 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