summaryrefslogtreecommitdiff
path: root/lib/libGL/libmesa/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libGL/libmesa/Makefile')
-rw-r--r--lib/libGL/libmesa/Makefile120
1 files changed, 66 insertions, 54 deletions
diff --git a/lib/libGL/libmesa/Makefile b/lib/libGL/libmesa/Makefile
index 5b0123b08..3ccc1c326 100644
--- a/lib/libGL/libmesa/Makefile
+++ b/lib/libGL/libmesa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/09/14 19:47:42 matthieu Exp $
+# $OpenBSD: Makefile,v 1.5 2008/11/02 15:01:32 matthieu Exp $
MESA= ${.CURDIR}/../../../dist/Mesa/src/mesa
MESA_INCLUDE= ${.CURDIR}/../../../dist/Mesa/include
@@ -116,42 +116,21 @@ MATH_SOURCES= \
m_vector.c \
m_xform.c
-# swrast
-SWRAST_SOURCES= \
- s_aaline.c \
- s_aatriangle.c \
- s_accum.c \
- s_alpha.c \
- s_atifragshader.c \
- s_bitmap.c \
- s_blend.c \
- s_blit.c \
- s_buffers.c \
- s_copypix.c \
- s_context.c \
- s_depth.c \
- s_drawpix.c \
- s_feedback.c \
- s_fog.c \
- s_fragprog.c \
- s_imaging.c \
- s_lines.c \
- s_logic.c \
- s_masking.c \
- s_points.c \
- s_readpix.c \
- s_span.c \
- s_stencil.c \
- s_texcombine.c \
- s_texfilter.c \
- s_texstore.c \
- s_triangle.c \
- s_zoom.c
-
-# swrast_setup
-SWRAST_SETUP_SOURCES= \
- ss_context.c \
- ss_triangle.c
+VBO_SOURCES = \
+ vbo_context.c \
+ vbo_exec.c \
+ vbo_exec_api.c \
+ vbo_exec_array.c \
+ vbo_exec_draw.c \
+ vbo_exec_eval.c \
+ vbo_rebase.c \
+ vbo_split.c \
+ vbo_split_copy.c \
+ vbo_split_inplace.c \
+ vbo_save.c \
+ vbo_save_api.c \
+ vbo_save_draw.c \
+ vbo_save_loopback.c
# tnl
TNL_SOURCES= \
@@ -173,22 +152,6 @@ TNL_SOURCES= \
t_vertex_sse.c \
t_vertex_generic.c \
-VBO_SOURCES = \
- vbo_context.c \
- vbo_exec.c \
- vbo_exec_api.c \
- vbo_exec_array.c \
- vbo_exec_draw.c \
- vbo_exec_eval.c \
- vbo_rebase.c \
- vbo_split.c \
- vbo_split_copy.c \
- vbo_split_inplace.c \
- vbo_save.c \
- vbo_save_api.c \
- vbo_save_draw.c \
- vbo_save_loopback.c
-
# shader
SHADER_SOURCES= \
arbprogparse.c \
@@ -205,9 +168,50 @@ SHADER_SOURCES= \
prog_parameter.c \
prog_print.c \
prog_statevars.c \
+ prog_uniform.c \
programopt.c \
shader_api.c \
+# swrast
+SWRAST_SOURCES= \
+ s_aaline.c \
+ s_aatriangle.c \
+ s_accum.c \
+ s_alpha.c \
+ s_atifragshader.c \
+ s_bitmap.c \
+ s_blend.c \
+ s_blit.c \
+ s_buffers.c \
+ s_copypix.c \
+ s_context.c \
+ s_depth.c \
+ s_drawpix.c \
+ s_feedback.c \
+ s_fog.c \
+ s_fragprog.c \
+ s_imaging.c \
+ s_lines.c \
+ s_logic.c \
+ s_masking.c \
+ s_points.c \
+ s_readpix.c \
+ s_span.c \
+ s_stencil.c \
+ s_texcombine.c \
+ s_texfilter.c \
+ s_texstore.c \
+ s_triangle.c \
+ s_zoom.c
+
+# swrast_setup
+SWRAST_SETUP_SOURCES= \
+ ss_context.c \
+ ss_triangle.c
+
+COMMON_DRIVER_SOURCES = \
+ driverfuncs.c
+
# shader/slang
SLANG_SOURCES= \
slang_builtin.c \
@@ -287,6 +291,7 @@ SOLO_SOURCES = \
$(SHADER_SOURCES) \
$(SWRAST_SOURCES) \
$(SWRAST_SETUP_SOURCES) \
+ $(COMMON_DRIVER_SOURCES) \
$(ASM_C_SOURCES) \
$(SLANG_SOURCES)
@@ -305,7 +310,7 @@ install:
@echo "Not installing libmesa"
clean:
- rm -f ${LIB}_pic.a ${OBJS} ${CLEANFILES}
+ rm -f ${LIB}_pic.a ${OBJS} $(CLEANFILES)
cleandir: clean
@@ -392,3 +397,10 @@ x86_xform4.so: matypes.h
.PATH: ${MESA}/drivers/common
.include <bsd.xorg.mk>
+
+# Prevent a gcc ICE
+.if ${MACHINE_ARCH} == mips64
+s_copypix.so: s_copypix.c
+ ${CC} -c -O0 ${CPPFLAGS} -fpic -DPIC $<
+.endif
+