X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FMakefile;h=ef16fc7d882257cdece66318695525ff7949ab52;hb=70a969f123c98cf6fca71a5fed4efed983edf6c8;hp=c485c89eb32e1a8b02cbb6416a4514e2c4d417f0;hpb=7a05161278531db97212c704a2f0258adb7d3324;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index c485c89eb32..ef16fc7d882 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,10 +3,12 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
-DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-
 C_SOURCES = \
 	lp_bld_alpha.c \
+	lp_bld_blend.c \
+	lp_bld_blend_aos.c \
+	lp_bld_blend_logicop.c \
+	lp_bld_blend_soa.c \
 	lp_bld_depth.c \
 	lp_bld_interp.c \
 	lp_clear.c \
@@ -15,9 +17,11 @@ C_SOURCES = \
 	lp_fence.c \
 	lp_flush.c \
 	lp_jit.c \
+	lp_memory.c \
 	lp_perf.c \
 	lp_query.c \
 	lp_rast.c \
+	lp_rast_debug.c \
 	lp_rast_tri.c \
 	lp_scene.c \
 	lp_scene_queue.c \
@@ -31,32 +35,41 @@ C_SOURCES = \
 	lp_state_clip.c \
 	lp_state_derived.c \
 	lp_state_fs.c \
+	lp_state_setup.c \
+	lp_state_gs.c \
 	lp_state_rasterizer.c \
 	lp_state_sampler.c \
+        lp_state_so.c \
 	lp_state_surface.c \
 	lp_state_vertex.c \
 	lp_state_vs.c \
 	lp_surface.c \
-	lp_tex_sample_llvm.c \
+	lp_tex_sample.c \
 	lp_texture.c \
 	lp_tile_image.c \
 	lp_tile_soa.c
 
 CPP_SOURCES = \
 
-PROGS := \
+PROGS := lp_test_format	\
+	 lp_test_arit	\
 	 lp_test_blend	\
 	 lp_test_conv	\
 	 lp_test_printf
 
+# Need this for the lp_test_*.o files
+CLEAN_EXTRA = *.o
 
 include ../../Makefile.template
 
-lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
-	python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
+PROGS_DEPS := ../../auxiliary/libgallium.a
 
+lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
+	$(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
 
-LIBS += $(GL_LIB_DEPS) -L../../auxiliary/ -lgallium
+LDFLAGS += $(LLVM_LDFLAGS)
+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+LD=$(CXX)
 
-$(PROGS): lp_test_main.o
+$(PROGS): lp_test_main.o libllvmpipe.a