Merge branch 'i965g-restart'

[mesa.git] / src / mesa / main / Makefile.win

diff --git a/src/mesa/main/Makefile.win b/src/mesa/main/Makefile.win
index ebc72c115388e8bf8717dacb667647fba7f40276..a27f44c112e369f1509da21866d927e82ab957f8 100644 (file)
--- a/src/mesa/main/Makefile.win
+++ b/src/mesa/main/Makefile.win
@@ -1,8 +1,9 @@
 # Makefile for Win32
 #
 #  NOTE: the install target may overwrite important files in the system dirs
-# Sept 12, 2001
-# Windows driver not working.  OSMesa driver works.
+#  Check first, before making the install target.
+#
+#  This builds both the osmesa and Windows drivers.
 #
 
 !include <win32.mak>
@@ -11,40 +12,17 @@ TOP = ..
 SUBDIRS = osmesa.dir
 
 CORE_SRCS = \
-       tnl\t_array_api.c \
-       tnl\t_array_import.c \
-       tnl\t_context.c \
-       tnl\t_eval_api.c \
-       tnl\t_imm_alloc.c \
-       tnl\t_imm_api.c \
-       tnl\t_imm_debug.c \
-       tnl\t_imm_dlist.c \
-       tnl\t_imm_elt.c \
-       tnl\t_imm_eval.c \
-       tnl\t_imm_exec.c \
-       tnl\t_imm_fixup.c \
-       tnl\t_pipeline.c \
-       tnl\t_vb_fog.c \
-       tnl\t_vb_light.c \
-       tnl\t_vb_normals.c \
-       tnl\t_vb_points.c \
-       tnl\t_vb_render.c \
-       tnl\t_vb_texgen.c \
-       tnl\t_vb_texmat.c \
-       tnl\t_vb_vertex.c \
-       swrast_setup\ss_context.c \
-       swrast_setup\ss_triangle.c \
-       swrast_setup\ss_vb.c \
        api_loopback.c \
        api_noop.c \
        api_validate.c \
        accum.c \
+       arbprogram.c \
        attrib.c \
        blend.c \
+       bufferobj.c \
        buffers.c \
        clip.c \
        colortab.c \
-       config.c \
        context.c \
        convolve.c \
        debug.c \
@@ -62,29 +40,31 @@ CORE_SRCS = \
        glapi.c \
        glthread.c \
        hash.c \
-       highpc.c \
        hint.c \
        histogram.c \
        image.c \
        imports.c \
        light.c \
        lines.c \
-       lowpc.c \
        matrix.c \
-       mem.c \
-       mmath.c \
+       nvprogram.c \
+       nvfragparse.c \
+       nvvertexec.c \
+       nvvertparse.c \
        pixel.c \
        points.c \
        polygon.c \
        rastpos.c \
        state.c \
        stencil.c \
+       texcompress.c \
+       texcompress_fxt1.c \
+       texcompress_s3tc.c \
        teximage.c \
        texformat.c \
        texobj.c \
        texstate.c \
        texstore.c \
-       texutil.c \
        varray.c \
        vtxfmt.c \
 #      X86\x86.c \
@@ -92,13 +72,11 @@ CORE_SRCS = \
 #      X86\3dnow.c \
 #      X86\sse.c \
        math\m_debug_norm.c \
-       math\m_debug_vertex.c \
        math\m_debug_xform.c \
        math\m_eval.c \
        math\m_matrix.c \
        math\m_translate.c \
        math\m_vector.c \
-       math\m_vertices.c \
        math\m_xform.c \
        array_cache\ac_context.c \
        array_cache\ac_import.c \
@@ -116,22 +94,45 @@ CORE_SRCS = \
        swrast\s_drawpix.c \
        swrast\s_feedback.c \
        swrast\s_fog.c \
-       swrast\s_histogram.c \
        swrast\s_imaging.c \
        swrast\s_lines.c \
        swrast\s_logic.c \
        swrast\s_masking.c \
-       swrast\s_pb.c \
+       swrast\s_nvfragprog.c \
        swrast\s_pixeltex.c \
        swrast\s_points.c \
        swrast\s_readpix.c \
-       swrast\s_scissor.c \
        swrast\s_span.c \
        swrast\s_stencil.c \
        swrast\s_texstore.c \
        swrast\s_texture.c \
        swrast\s_triangle.c \
-       swrast\s_zoom.c
+       swrast\s_zoom.c \
+       swrast_setup\ss_context.c \
+       swrast_setup\ss_triangle.c \
+       swrast_setup\ss_vb.c \
+       tnl\t_array_api.c \
+       tnl\t_array_import.c \
+       tnl\t_context.c \
+       tnl\t_eval_api.c \
+       tnl\t_imm_alloc.c \
+       tnl\t_imm_api.c \
+       tnl\t_imm_debug.c \
+       tnl\t_imm_dlist.c \
+       tnl\t_imm_elt.c \
+       tnl\t_imm_eval.c \
+       tnl\t_imm_exec.c \
+       tnl\t_imm_fixup.c \
+       tnl\t_pipeline.c \
+       tnl\t_vb_fog.c \
+       tnl\t_vb_light.c \
+       tnl\t_vb_normals.c \
+       tnl\t_vb_points.c \
+       tnl\t_vb_program.c \
+       tnl\t_vb_render.c \
+       tnl\t_vb_texgen.c \
+       tnl\t_vb_texmat.c \
+       tnl\t_vb_vertex.c
 
 DRIVER_SRCS = \
        Trace\tr_context.c \