Mesa (master): d3d1x: fix compilation with recent Wine versions installed
Luca Barbieri
lb at kemper.freedesktop.org
Tue Sep 21 13:47:49 UTC 2010
Module: Mesa
Branch: master
Commit: cb7cc36fff63e1bbdf4820538a8133f150541be4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb7cc36fff63e1bbdf4820538a8133f150541be4
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Tue Sep 21 15:39:42 2010 +0200
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.
---
.../state_trackers/d3d1x/d3d1xshader/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
index 6ac74d1..8c8e2fb 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
More information about the mesa-commit
mailing list