diff options
| author | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2010-06-11 20:33:44 +1000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-07-23 23:38:07 +0100 |
| commit | 1874cb7e82a566079219a571d6a30a74581c611e (patch) | |
| tree | 82d2d49f1df1b82493c594ec0db009bd2ca82eac /src/mesa/Makefile | |
| parent | cf864fd58b2a4780482a108cd3ff86779e8fa965 (diff) | |
gallium: Fix build with llvm installed in non-standard location
The es1, es2 and gl state trackers include draw_pipe.h, which includes
the llvm headers if MESA_LLVM is true, so we also need to add the
llvm seachpaths.
Similarly, gallivm and other gallium drivers need LLVM_CFLAGS to build when enabled.
Also fix xorg drivers, they didn't include LDFLAGS.
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 3e0f010671..7073c92240 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -20,6 +20,13 @@ MESA_CPPFLAGS := $(API_DEFINES) ES1_CPPFLAGS := -DFEATURE_ES1=1 ES2_CPPFLAGS := -DFEATURE_ES2=1 +ifeq ($(MESA_LLVM),1) +MESA_CPPFLAGS += $(LLVM_CFLAGS) +ES1_CPPFLAGS += $(LLVM_CFLAGS) +ES2_CPPFLAGS += $(LLVM_CFLAGS) +endif + + include sources.mak # adjust object dirs |