diff options
| -rw-r--r-- | src/mesa/Makefile.DJ | 136 | ||||
| -rw-r--r-- | src/mesa/Makefile.mgw | 138 | ||||
| -rw-r--r-- | src/mesa/Makefile.wfx | 4 | 
3 files changed, 8 insertions, 270 deletions
diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ index 71e44861f8..517e24b3b4 100644 --- a/src/mesa/Makefile.DJ +++ b/src/mesa/Makefile.DJ @@ -20,7 +20,7 @@  # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN  # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# DOS/DJGPP core makefile v1.4 for Mesa +# DOS/DJGPP core makefile v1.5 for Mesa  #  #  Copyright (C) 2002 - Borca Daniel  #  Email : dborca@users.sourceforge.net @@ -91,139 +91,7 @@ else  UNLINK = $(RM) $(1)  endif -MAIN_SOURCES = \ -	main/api_arrayelt.c \ -	main/api_loopback.c \ -	main/api_noop.c \ -	main/api_validate.c \ -	main/accum.c \ -	main/arbparse.c \ -	main/arbprogram.c \ -	main/arbfragparse.c \ -	main/arbvertparse.c \ -	main/attrib.c \ -	main/blend.c \ -	main/bufferobj.c \ -	main/buffers.c \ -	main/clip.c \ -	main/colortab.c \ -	main/context.c \ -	main/convolve.c \ -	main/debug.c \ -	main/depth.c \ -	main/dispatch.c \ -	main/dlist.c \ -	main/drawpix.c \ -	main/enable.c \ -	main/enums.c \ -	main/eval.c \ -	main/extensions.c \ -	main/feedback.c \ -	main/fog.c \ -	main/get.c \ -	main/hash.c \ -	main/hint.c \ -	main/histogram.c \ -	main/image.c \ -	main/imports.c \ -	main/light.c \ -	main/lines.c \ -	main/matrix.c \ -	main/nvprogram.c \ -	main/nvfragparse.c \ -	main/nvvertexec.c \ -	main/nvvertparse.c \ -	main/occlude.c \ -	main/pixel.c \ -	main/points.c \ -	main/polygon.c \ -	main/program.c \ -	main/rastpos.c \ -	main/state.c \ -	main/stencil.c \ -	main/texcompress.c \ -	main/texformat.c \ -	main/teximage.c \ -	main/texobj.c \ -	main/texstate.c \ -	main/texstore.c \ -	main/texutil.c \ -	main/varray.c \ -	main/vtxfmt.c - -GLAPI_SOURCES = \ -	glapi/glapi.c \ -	glapi/glthread.c - -MATH_SOURCES = \ -	math/m_debug_clip.c \ -	math/m_debug_norm.c \ -	math/m_debug_xform.c \ -	math/m_eval.c \ -	math/m_matrix.c \ -	math/m_translate.c \ -	math/m_vector.c \ -	math/m_xform.c - -ARRAY_CACHE_SOURCES = \ -	array_cache/ac_context.c \ -	array_cache/ac_import.c - -SWRAST_SOURCES = \ -	swrast/s_aaline.c \ -	swrast/s_aatriangle.c \ -	swrast/s_accum.c \ -	swrast/s_alpha.c \ -	swrast/s_alphabuf.c \ -	swrast/s_bitmap.c \ -	swrast/s_blend.c \ -	swrast/s_buffers.c \ -	swrast/s_copypix.c \ -	swrast/s_context.c \ -	swrast/s_depth.c \ -	swrast/s_drawpix.c \ -	swrast/s_feedback.c \ -	swrast/s_fog.c \ -	swrast/s_imaging.c \ -	swrast/s_lines.c \ -	swrast/s_logic.c \ -	swrast/s_masking.c \ -	swrast/s_nvfragprog.c \ -	swrast/s_pixeltex.c \ -	swrast/s_points.c \ -	swrast/s_readpix.c \ -	swrast/s_span.c \ -	swrast/s_stencil.c \ -	swrast/s_texture.c \ -	swrast/s_texstore.c \ -	swrast/s_triangle.c \ -	swrast/s_zoom.c - -SWRAST_SETUP_SOURCES = \ -	swrast_setup/ss_context.c \ -	swrast_setup/ss_triangle.c \ -	swrast_setup/ss_vb.c - -TNL_SOURCES = \ -	tnl/t_array_api.c \ -	tnl/t_array_import.c \ -	tnl/t_context.c \ -	tnl/t_pipeline.c \ -	tnl/t_save_api.c \ -	tnl/t_save_loopback.c \ -	tnl/t_save_playback.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 \ -	tnl/t_vtx_api.c \ -	tnl/t_vtx_eval.c \ -	tnl/t_vtx_exec.c  +include sources  X86_SOURCES = \  	x86/x86.c \ diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index 3f9ddaa504..2068667c60 100644 --- a/src/mesa/Makefile.mgw +++ b/src/mesa/Makefile.mgw @@ -20,7 +20,7 @@  # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN  # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# MinGW core makefile v1.0 for Mesa +# MinGW core makefile v1.1 for Mesa  #  #  Copyright (C) 2002 - Borca Daniel  #  Email : dborca@users.sourceforge.net @@ -92,139 +92,7 @@ else  UNLINK = $(RM) $(1)  endif -MAIN_SOURCES = \ -	main/api_arrayelt.c \ -	main/api_loopback.c \ -	main/api_noop.c \ -	main/api_validate.c \ -	main/accum.c \ -	main/arbparse.c \ -	main/arbprogram.c \ -	main/arbfragparse.c \ -	main/arbvertparse.c \ -	main/attrib.c \ -	main/blend.c \ -	main/bufferobj.c \ -	main/buffers.c \ -	main/clip.c \ -	main/colortab.c \ -	main/context.c \ -	main/convolve.c \ -	main/debug.c \ -	main/depth.c \ -	main/dispatch.c \ -	main/dlist.c \ -	main/drawpix.c \ -	main/enable.c \ -	main/enums.c \ -	main/eval.c \ -	main/extensions.c \ -	main/feedback.c \ -	main/fog.c \ -	main/get.c \ -	main/hash.c \ -	main/hint.c \ -	main/histogram.c \ -	main/image.c \ -	main/imports.c \ -	main/light.c \ -	main/lines.c \ -	main/matrix.c \ -	main/nvprogram.c \ -	main/nvfragparse.c \ -	main/nvvertexec.c \ -	main/nvvertparse.c \ -	main/occlude.c \ -	main/pixel.c \ -	main/points.c \ -	main/polygon.c \ -	main/program.c \ -	main/rastpos.c \ -	main/state.c \ -	main/stencil.c \ -	main/texcompress.c \ -	main/texformat.c \ -	main/teximage.c \ -	main/texobj.c \ -	main/texstate.c \ -	main/texstore.c \ -	main/texutil.c \ -	main/varray.c \ -	main/vtxfmt.c - -GLAPI_SOURCES = \ -	glapi/glapi.c \ -	glapi/glthread.c - -MATH_SOURCES = \ -	math/m_debug_clip.c \ -	math/m_debug_norm.c \ -	math/m_debug_xform.c \ -	math/m_eval.c \ -	math/m_matrix.c \ -	math/m_translate.c \ -	math/m_vector.c \ -	math/m_xform.c - -ARRAY_CACHE_SOURCES = \ -	array_cache/ac_context.c \ -	array_cache/ac_import.c - -SWRAST_SOURCES = \ -	swrast/s_aaline.c \ -	swrast/s_aatriangle.c \ -	swrast/s_accum.c \ -	swrast/s_alpha.c \ -	swrast/s_alphabuf.c \ -	swrast/s_bitmap.c \ -	swrast/s_blend.c \ -	swrast/s_buffers.c \ -	swrast/s_copypix.c \ -	swrast/s_context.c \ -	swrast/s_depth.c \ -	swrast/s_drawpix.c \ -	swrast/s_feedback.c \ -	swrast/s_fog.c \ -	swrast/s_imaging.c \ -	swrast/s_lines.c \ -	swrast/s_logic.c \ -	swrast/s_masking.c \ -	swrast/s_nvfragprog.c \ -	swrast/s_pixeltex.c \ -	swrast/s_points.c \ -	swrast/s_readpix.c \ -	swrast/s_span.c \ -	swrast/s_stencil.c \ -	swrast/s_texture.c \ -	swrast/s_texstore.c \ -	swrast/s_triangle.c \ -	swrast/s_zoom.c - -SWRAST_SETUP_SOURCES = \ -	swrast_setup/ss_context.c \ -	swrast_setup/ss_triangle.c \ -	swrast_setup/ss_vb.c - -TNL_SOURCES = \ -	tnl/t_array_api.c \ -	tnl/t_array_import.c \ -	tnl/t_context.c \ -	tnl/t_pipeline.c \ -	tnl/t_save_api.c \ -	tnl/t_save_loopback.c \ -	tnl/t_save_playback.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 \ -	tnl/t_vtx_api.c \ -	tnl/t_vtx_eval.c \ -	tnl/t_vtx_exec.c  +include sources  X86_SOURCES = \  	x86/x86.c \ @@ -337,6 +205,8 @@ x86/gen_matypes.exe: x86/gen_matypes.c  # in order to generate correct entrypoints  x86/glapi_x86.o: x86/glapi_x86.S  	$(CC) -o $@ $(CFLAGS) -U__WIN32__ -DSTDCALL_API -c $< +#main/dispatch.o: main/dispatch.c +#	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<  clean:  	-$(call UNLINK,array_cache/*.o) diff --git a/src/mesa/Makefile.wfx b/src/mesa/Makefile.wfx index 0886c2c152..2dd985b78c 100644 --- a/src/mesa/Makefile.wfx +++ b/src/mesa/Makefile.wfx @@ -224,8 +224,7 @@ SWRAST_SOURCES =\  SWRAST_SETUP_SOURCES =\  	swrast_setup\ss_context.c\ -	swrast_setup\ss_triangle.c\ -	swrast_setup\ss_vb.c +	swrast_setup\ss_triangle.c  TNL_SOURCES =\  	tnl\t_array_api.c\ @@ -244,6 +243,7 @@ TNL_SOURCES =\  	tnl\t_vb_texgen.c\  	tnl\t_vb_texmat.c\  	tnl\t_vb_vertex.c\ +	tnl\t_vertex.c\  	tnl\t_vtx_api.c\  	tnl\t_vtx_eval.c\  	tnl\t_vtx_exec.c   | 
