llvmpipe: Fix MSVC build.

[mesa.git] / src / gallium / drivers / llvmpipe / Makefile

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index e880042b71e9910fd696a8532185dcc4654f92ab..55b877b4ab9992075318b2bd44112b82772f2e7b 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -6,21 +6,30 @@ LIBNAME = llvmpipe
 DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 C_SOURCES = \
-       lp_buffer.c \
+       lp_bld_alpha.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 \
        lp_context.c \
        lp_draw_arrays.c \
        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 \
        lp_screen.c \
        lp_setup.c \
+       lp_setup_coef.c \
+       lp_setup_coef_intrin.c \
        lp_setup_line.c \
        lp_setup_point.c \
        lp_setup_tri.c \
@@ -29,38 +38,43 @@ C_SOURCES = \
        lp_state_clip.c \
        lp_state_derived.c \
        lp_state_fs.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_surface.c \
+       lp_tile_image.c \
        lp_tile_soa.c
 
 CPP_SOURCES = \
 
+PROGS := lp_test_format        \
+        lp_test_blend  \
+        lp_test_conv   \
+        lp_test_printf \
+        lp_test_round \
+         lp_test_sincos
 
-include ../../Makefile.template
-
-lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_access.py ../../auxiliary/util/u_format.csv
-       python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
+# Need this for the lp_test_*.o files
+CLEAN_EXTRA = *.o
 
+lp_test_sincos.o : sse_mathfun.h
 
-# to make a .s file to inspect assembly code
-.c.s:
-       $(CC) -S $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $<
+PROGS_DEPS := ../../auxiliary/libgallium.a
 
+include ../../Makefile.template
 
-testprogs := lp_test_format    \
-            lp_test_blend      \
-            lp_test_conv
+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 > $@
 
-LIBS += $(GL_LIB_DEPS) -L. -lllvmpipe -L../../auxiliary/ -lgallium
+LDFLAGS += $(LLVM_LDFLAGS)
+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+LD=g++
 
-$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o libllvmpipe.a
-       $(LD) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
+$(PROGS): lp_test_main.o libllvmpipe.a
 
-default: $(testprogs)