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 | |
| 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')
| -rw-r--r-- | src/gallium/Makefile.template | 4 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.xorg | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template index 43203b1756..bff399ec64 100644 --- a/src/gallium/Makefile.template +++ b/src/gallium/Makefile.template @@ -23,6 +23,10 @@ INCLUDES = \ -I$(TOP)/src/gallium/drivers \ $(LIBRARY_INCLUDES) +ifeq ($(MESA_LLVM),1) +LIBRARY_DEFINES += $(LLVM_CFLAGS) +endif + ##### TARGETS ##### diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg index c2d0064978..762c905985 100644 --- a/src/gallium/targets/Makefile.xorg +++ b/src/gallium/targets/Makefile.xorg @@ -42,7 +42,7 @@ endif default: depend $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING) $(LIBNAME): $(OBJECTS) Makefile ../Makefile.xorg $(LIBS) $(DRIVER_PIPES) - $(MKLIB) -noprefix -o $@ $(OBJECTS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $(DRIVER_LINKS) + $(MKLIB) -noprefix -o $@ $(LDFLAGS) $(OBJECTS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $(DRIVER_LINKS) depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURCES) rm -f depend 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 |