Adjust for the latest XFree86 import. Code now compiles, but libraries
might be incomplete and sets are definitely still broken.
This commit is contained in:
christos
parent
e652c56005
commit
cc19f24e9f
|
|
@ -1,59 +1,72 @@
|
|||
# $NetBSD: Makefile.GLcore,v 1.7 2004/05/14 07:21:24 he Exp $
|
||||
# $NetBSD: Makefile.GLcore,v 1.8 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
LIB= GLcore
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src
|
||||
SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c api_noop.c \
|
||||
api_validate.c attrib.c blend.c buffers.c clip.c colortab.c \
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi
|
||||
SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \
|
||||
api_validate.c attrib.c blend.c buffers.c bufferobj.c clip.c \
|
||||
colortab.c \
|
||||
context.c convolve.c debug.c depth.c dispatch.c dlist.c \
|
||||
drawpix.c enable.c enums.c eval.c extensions.c feedback.c \
|
||||
fog.c get.c glapi.c glthread.c hash.c hint.c histogram.c \
|
||||
image.c imports.c light.c lines.c matrix.c mmath.c pixel.c \
|
||||
image.c imports.c light.c lines.c matrix.c occlude.c pixel.c \
|
||||
points.c polygon.c rastpos.c state.c stencil.c texcompress.c \
|
||||
texformat.c teximage.c texobj.c texstate.c texstore.c \
|
||||
texutil.c varray.c vtxfmt.c vpexec.c vpexec.h vpparse.c \
|
||||
vpstate.c
|
||||
texformat.c texcompress_fxt1.c texcompress_s3tc.c teximage.c \
|
||||
texobj.c texstate.c texstore.c varray.c vtxfmt.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache
|
||||
SRCS+= ac_context.c ac_import.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math
|
||||
SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
|
||||
m_matrix.c m_translate.c m_vector.c m_xform.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast
|
||||
SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
|
||||
s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c s_histogram.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c \
|
||||
s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
|
||||
s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
|
||||
s_texture.c s_triangle.c s_zoom.c
|
||||
s_texture.c s_triangle.c s_zoom.c s_nvfragprog.c \
|
||||
s_auxbuffer.c
|
||||
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
|
||||
SRCS+= ss_context.c ss_triangle.c ss_vb.c
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup
|
||||
SRCS+= ss_context.c ss_triangle.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl
|
||||
SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \
|
||||
t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
|
||||
t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader
|
||||
SRCS+= arbprogram.c nvprogram.c arbfragparse.c arbvertparse.c program.c \
|
||||
nvvertexec.c nvfragparse.c arbprogparse.c grammar_mesa.c \
|
||||
nvvertparse.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl
|
||||
SRCS+= t_array_api.c t_array_import.c t_context.c \
|
||||
t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
|
||||
t_vb_points.c t_vb_program.c t_vb_render.c t_vb_texgen.c \
|
||||
t_vb_texmat.c t_vb_vertex.c
|
||||
t_vb_texmat.c t_vb_vertex.c t_vtx_api.c t_vtx_generic.c \
|
||||
t_vtx_eval.c t_save_api.c t_vtx_exec.c t_vertex.c t_vertex_c.c \
|
||||
t_save_playback.c t_save_loopback.c
|
||||
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11
|
||||
SRCS+= xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common
|
||||
SRCS+= glcontextmodes.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers//common
|
||||
SRCS+= driverfuncs.c
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X
|
||||
.PATH: ${X11SRCDIR.xc}/lib/GL/glx
|
||||
SRCS+= compsize.c xf86glx.c xf86glx_util.c
|
||||
|
||||
|
|
@ -63,13 +76,19 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
|||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/lib/GL/glx \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/include \
|
||||
-I${XSERVERINCDIR} \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/X \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/GL/include \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X
|
||||
|
||||
CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.glx,v 1.5 2004/03/06 03:31:05 rtr Exp $
|
||||
# $NetBSD: Makefile.glx,v 1.6 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
LIB= glx
|
||||
|
||||
|
|
@ -18,7 +18,9 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
|
|||
-I${X11SRCDIR.xc}/programs/Xserver/mi \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${X11SRCDIR.xc}/include/fonts \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include
|
||||
|
||||
CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# $NetBSD: Makefile,v 1.4 2004/01/06 14:12:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
SUBDIR=bitmap freetype type1 xtt speedo
|
||||
SUBDIR=bitmap freetype type1 speedo
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2004/03/27 15:27:01 soren Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -15,6 +15,7 @@ DUMMYOBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/dummy && ${PRINTOBJDIR}
|
|||
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/include \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
|
||||
|
||||
|
|
@ -7,7 +7,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
|
|||
MODULE= dummy_drv
|
||||
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy
|
||||
|
||||
SRCS= dummy_driver.c dummy_cursor.c dummy_dga.c
|
||||
SRCS= dummy_driver.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.13 2005/02/24 14:54:02 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.14 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include "../Makefile.serverlib"
|
||||
.include <bsd.own.mk>
|
||||
|
|
@ -7,7 +7,7 @@ LIB= os
|
|||
.PATH: ${X11SRCDIR.xc}/lib/xtrans
|
||||
SRCS= WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
|
||||
utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
|
||||
xdmcp.c transport.c lbxio.c
|
||||
xdmcp.c transport.c lbxio.c GetTimeInMillis.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
|
||||
-I${XSERVERINCDIR} \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2004/03/06 03:09:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -6,9 +6,16 @@
|
|||
|
||||
MAN= mkfontdir.1
|
||||
|
||||
CPPSCRIPTS= mkfontdir
|
||||
CPPSCRIPTFLAGS= -DBINDIR=${X11BINDIR}
|
||||
SCRIPTS= mkfontdir
|
||||
PROG= mkfontdir
|
||||
CPPFLAGS+=-I${X11SRCDIR.xc}/lib/font/include
|
||||
CPPFLAGS+=-I${X11SRCDIR.xc}/include/fonts
|
||||
LDADD+= -lXfont -lfreetype -lfntstubs
|
||||
DPADD+= ${LIBXFONT} ${LIBFREETYPE} ${LIBFNTSTUBS}
|
||||
LDADD+= -lXt -lXext -lX11 -lz -lm
|
||||
DPADD+= ${LIBXT} ${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
|
||||
#CPPSCRIPTS= mkfontdir
|
||||
#CPPSCRIPTFLAGS= -DBINDIR=${X11BINDIR}
|
||||
#SCRIPTS= mkfontdir
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.prog.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -34,8 +34,8 @@ deftwmrc.c: system.twmrc deftwmrc.sed
|
|||
echo ' (char *) 0 };' >>$@
|
||||
|
||||
|
||||
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
|
||||
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
|
||||
LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
|
||||
DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/programs/${PROG}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2004/03/06 03:14:23 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -14,6 +14,7 @@ INCS= MITMisc.h Print.h Printstr.h XEVI.h XEVIstr.h XI.h \
|
|||
dpmsstr.h extutil.h fontcache.h fontcacheP.h fontcachstr.h lbxbuf.h \
|
||||
lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h \
|
||||
mitmiscstr.h multibuf.h multibufst.h panoramiXext.h panoramiXproto.h \
|
||||
panoramiXwrap.h \
|
||||
randr.h randrproto.h record.h recordstr.h render.h renderproto.h \
|
||||
saver.h saverproto.h scrnsaver.h security.h securstr.h shape.h \
|
||||
shapestr.h shmstr.h sync.h syncstr.h xcmiscstr.h xf86bigfont.h \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -6,6 +6,8 @@ LIB= GL
|
|||
|
||||
# glx
|
||||
.PATH: ${X11SRCDIR.xc}/lib/GL/glx
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common
|
||||
SRCS.glx= clientattrib.c compsize.c dispatch.c eval.c g_render.c \
|
||||
g_single.c g_vendpriv.c glthread.c glxcmds.c glxext.c \
|
||||
glxextensions.c glcontextmodes.c indirect_init.c \
|
||||
|
|
@ -16,7 +18,7 @@ SRCS.glx= clientattrib.c compsize.c dispatch.c eval.c g_render.c \
|
|||
SRCS.glx+= glapi.c
|
||||
|
||||
.if ${MACHINE} == "i386"
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X86
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
|
||||
SRCS.glx+= glapi_x86.S
|
||||
CPPFLAGS+= -DUSE_X86_ASM -I${X11SRCDIR.xc}/extras/Mesa/src/X86
|
||||
# -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
|
||||
|
|
@ -100,11 +102,8 @@ CPPFLAGS.${fn}+=-I${X11SRCDIR.xc}/lib/GL/dri \
|
|||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/array_cache \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/math \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/tnl \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/include
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi
|
||||
CPPFLAGS.${fn}+=${X11FLAGS.DRI}
|
||||
|
||||
.endfor
|
||||
|
|
@ -118,7 +117,10 @@ SRCS+= ${SRCS.glx}
|
|||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
|
||||
${X11FLAGS.THREADS} -DGLXEXT -DGLX_USE_MESA
|
||||
|
||||
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.15 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.16 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
|
||||
|
||||
|
|
@ -6,41 +6,39 @@ NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
|
|||
|
||||
LIB= OSMesa
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/OSmesa
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/osmesa
|
||||
SRCS= osmesa.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src
|
||||
SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c api_noop.c \
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main
|
||||
SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \
|
||||
api_validate.c attrib.c blend.c buffers.c clip.c colortab.c \
|
||||
context.c convolve.c debug.c depth.c dlist.c drawpix.c \
|
||||
enable.c enums.c eval.c extensions.c feedback.c fog.c get.c \
|
||||
hash.c hint.c histogram.c image.c imports.c light.c lines.c \
|
||||
matrix.c mmath.c pixel.c points.c polygon.c rastpos.c \
|
||||
matrix.c pixel.c points.c polygon.c rastpos.c \
|
||||
state.c stencil.c texformat.c teximage.c texobj.c \
|
||||
texstate.c texstore.c texutil.c varray.c vtxfmt.c
|
||||
texstate.c texstore.c varray.c vtxfmt.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache
|
||||
SRCS+= ac_context.c ac_import.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math
|
||||
SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
|
||||
m_matrix.c m_translate.c m_vector.c m_xform.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast
|
||||
SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
|
||||
s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c s_histogram.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c \
|
||||
s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
|
||||
s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
|
||||
s_texture.c s_triangle.c s_zoom.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
|
||||
SRCS+= ss_context.c ss_triangle.c ss_vb.c
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup
|
||||
SRCS+= ss_context.c ss_triangle.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl
|
||||
SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \
|
||||
t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
|
||||
t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl
|
||||
SRCS+= t_array_api.c t_array_import.c t_context.c \
|
||||
t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
|
||||
t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
|
||||
t_vb_vertex.c
|
||||
|
|
@ -54,12 +52,16 @@ CPPFLAGS+= ${X11FLAGS.DRI}
|
|||
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \
|
||||
${X11FLAGS.THREADS} \
|
||||
-DGLXEXT -DGLX_USE_MESA
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X86
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
|
||||
SRCS+= common_x86.c common_x86_asm.S x86.c x86_cliptest.S \
|
||||
x86_xform2.S x86_xform3.S x86_xform4.S \
|
||||
mmx_blend.S \
|
||||
|
|
@ -73,7 +75,7 @@ SRCS+= common_x86.c common_x86_asm.S x86.c x86_cliptest.S \
|
|||
|
||||
CPPFLAGS+= -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
|
||||
COMPILE.S= ${COMPILE.s} # XXX don't want -traditional-cpp
|
||||
AFLAGS+= -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/X86
|
||||
AFLAGS+= -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_CPU} == "sh5"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.8 2004/04/05 12:03:25 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ SRCS= ${SRCS.bitmap} ${SRCS.fontfile} ${SRCS.fc} \
|
|||
${SRCS.FreeType} ${SRCS.X-TrueType} ${SRCS.builtins} \
|
||||
${SRCS.util}
|
||||
|
||||
SUBDIR= stubs xtt
|
||||
SUBDIR= stubs
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.8 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ FREETYPESRC= ${FREETYPETOP}/src
|
|||
SUBDIR= freetype
|
||||
|
||||
SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
|
||||
ftinit.c ftmm.c ftpfr.c ftstroker.c ftsynth.c ftsystem.c \
|
||||
ftinit.c ftlzw.c ftmm.c ftpfr.c ftsynth.c ftsystem.c \
|
||||
fttype1.c ftwinfnt.c ftxf86.c autohint.c bdf.c cff.c \
|
||||
type1cid.c ftgzip.c pcf.c pfr.c psaux.c pshinter.c psnames.c \
|
||||
raster.c sfnt.c smooth.c truetype.c type1.c type42.c winfnt.c
|
||||
|
|
@ -32,6 +32,7 @@ CPPFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
|
|||
.PATH: ${FREETYPESRC}/cff
|
||||
.PATH: ${FREETYPESRC}/cid
|
||||
.PATH: ${FREETYPESRC}/gzip
|
||||
.PATH: ${FREETYPESRC}/lzw
|
||||
.PATH: ${FREETYPESRC}/pcf
|
||||
.PATH: ${FREETYPESRC}/pfr
|
||||
.PATH: ${FREETYPESRC}/psaux
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.6 2004/03/11 16:13:30 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ INCSDIR=${X11INCDIR}/freetype2/freetype
|
|||
|
||||
INCS= freetype.h ftbbox.h ftbdf.h ftcache.h ftchapters.h fterrdef.h \
|
||||
fterrors.h ftglyph.h ftgzip.h ftimage.h ftincrem.h ftlist.h \
|
||||
ftmac.h ftmm.h ftmoderr.h ftmodule.h ftoutln.h ftpfr.h \
|
||||
ftrender.h ftsizes.h ftsnames.h ftstroker.h ftsynth.h ftsysio.h \
|
||||
ftlzw.h ftmac.h ftmm.h ftmoderr.h ftmodapi.h ftoutln.h ftpfr.h \
|
||||
ftrender.h ftsizes.h ftsnames.h ftsynth.h ftsysio.h \
|
||||
ftsysmem.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
|
||||
t1tables.h ttnameid.h tttables.h tttags.h
|
||||
t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h
|
||||
|
||||
SCRIPTS= freetype-config
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:56 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
INCSDIR=${X11INCDIR}/freetype2/freetype/cache
|
||||
|
||||
INCS= ftccache.h ftccmap.h ftcglyph.h ftcimage.h ftcmanag.h \
|
||||
ftcsbits.h ftlru.h
|
||||
ftcsbits.h
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.prog.mk>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,19 @@
|
|||
# $NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
SUBDIR=services
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/freetype2/include/freetype/internal
|
||||
|
||||
INCSDIR=${X11INCDIR}/freetype2/freetype/internal
|
||||
|
||||
INCS= autohint.h bdftypes.h cfftypes.h fnttypes.h ftcalc.h \
|
||||
ftcore.h ftdebug.h ftdriver.h ftexcept.h ftgloadr.h \
|
||||
fthash.h ftmemory.h ftobject.h ftobjs.h ftstream.h \
|
||||
fttrace.h internal.h pcftypes.h psaux.h pfr.h pshints.h \
|
||||
psnames.h sfnt.h t1types.h t42types.h tttypes.h
|
||||
INCS= autohint.h ftcalc.h \
|
||||
ftdebug.h ftdriver.h ftgloadr.h \
|
||||
ftmemory.h ftobjs.h ftrfork.h ftserv.h ftstream.h \
|
||||
fttrace.h internal.h pcftypes.h psaux.h pshints.h \
|
||||
sfnt.h t1types.h tttypes.h
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.prog.mk>
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
# $NetBSD: Makefile,v 1.2 2005/03/19 21:41:58 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/freetype2/include/freetype/internal/services
|
||||
|
||||
INCSDIR=${X11INCDIR}/freetype2/freetype/internal/services
|
||||
|
||||
INCS= svbdf.h svgldict.h svmm.h svpfr.h svpostnm.h svpscmap.h svpsinfo.h \
|
||||
svsfnt.h svttcmap.h svwinfnt.h svxf86nm.h
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.prog.mk>
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
# $NetBSD: Makefile,v 1.4 2004/01/05 12:25:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/03/19 21:41:59 christos Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
MAN= X.7 XConsortium.7 XStandards.7 XProjectTeam.7 Xsecurity.7
|
||||
MLINKS= XProjectTeam.7 X.Org.7
|
||||
MAN= X.7 XStandards.7 Xsecurity.7
|
||||
MLINKS= X.Org.7
|
||||
|
||||
BUILDSYMLINKS= Consortium.man XConsortium.man \
|
||||
Standards.man XStandards.man \
|
||||
BUILDSYMLINKS= Standards.man XStandards.man \
|
||||
security.man Xsecurity.man
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/doc/man/general
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.8 2004/04/28 14:17:57 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2005/03/19 21:41:59 christos Exp $
|
||||
|
||||
NOMAN= 1
|
||||
|
||||
|
|
@ -25,6 +25,7 @@ SRCS+= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
|
|||
.PATH: ${FREETYPESRC}/cff
|
||||
.PATH: ${FREETYPESRC}/cid
|
||||
.PATH: ${FREETYPESRC}/gzip
|
||||
.PATH: ${FREETYPESRC}/lzw
|
||||
.PATH: ${FREETYPESRC}/pcf
|
||||
.PATH: ${FREETYPESRC}/pfr
|
||||
.PATH: ${FREETYPESRC}/psaux
|
||||
|
|
@ -41,7 +42,7 @@ SRCS+= autohint.c bdf.c cff.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
|
|||
ftglyph.c ftinit.c ftmm.c ftsynth.c ftsystem.c fttype1.c \
|
||||
ftxf86.c pcf.c pfr.c psaux.c pshinter.c psnames.c raster.c \
|
||||
sfnt.c smooth.c truetype.c type1.c type1cid.c type42.c \
|
||||
winfnt.c ftgzip.c
|
||||
winfnt.c ftgzip.c ftlzw.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/expat/lib
|
||||
SRCS+= xmlparse.c xmlrole.c xmltok.c
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
# $NetBSD: Makefile,v 1.1 2004/02/07 04:19:29 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2005/03/19 21:41:59 christos Exp $
|
||||
|
||||
NOMAN= 1
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X86
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
|
||||
|
||||
HOSTPROG= gen_matypes
|
||||
HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi
|
||||
|
||||
.include <bsd.hostprog.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2004/04/12 15:41:27 dbj Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/03/19 21:41:59 christos Exp $
|
||||
|
||||
NOMAN= 1
|
||||
|
||||
|
|
@ -19,6 +19,7 @@ FREETYPESRC= ${FREETYPETOP}/src
|
|||
.PATH: ${FREETYPESRC}/cff
|
||||
.PATH: ${FREETYPESRC}/cid
|
||||
.PATH: ${FREETYPESRC}/gzip
|
||||
.PATH: ${FREETYPESRC}/lzw
|
||||
.PATH: ${FREETYPESRC}/pcf
|
||||
.PATH: ${FREETYPESRC}/pfr
|
||||
.PATH: ${FREETYPESRC}/psaux
|
||||
|
|
@ -32,7 +33,7 @@ FREETYPESRC= ${FREETYPETOP}/src
|
|||
.PATH: ${FREETYPESRC}/type42
|
||||
.PATH: ${FREETYPESRC}/winfonts
|
||||
SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
|
||||
ftinit.c ftmm.c ftpfr.c ftstroker.c ftsynth.c ftsystem.c \
|
||||
ftinit.c ftlzw.c ftmm.c ftpfr.c ftsynth.c ftsystem.c \
|
||||
fttype1.c ftwinfnt.c ftxf86.c autohint.c bdf.c cff.c \
|
||||
type1cid.c ftgzip.c pcf.c pfr.c psaux.c pshinter.c psnames.c \
|
||||
raster.c sfnt.c smooth.c truetype.c type1.c type42.c winfnt.c
|
||||
|
|
|
|||
Loading…
Reference in New Issue