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.
This commit is contained in:
parent
cf864fd58b
commit
1874cb7e82
|
@ -23,6 +23,10 @@ INCLUDES = \
|
|||
-I$(TOP)/src/gallium/drivers \
|
||||
$(LIBRARY_INCLUDES)
|
||||
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
LIBRARY_DEFINES += $(LLVM_CFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
##### TARGETS #####
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue