head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	netbsd-6-0-6-RELEASE:1.1.1.4
	netbsd-6-1-5-RELEASE:1.1.1.4
	netbsd-6-1-4-RELEASE:1.1.1.4
	netbsd-6-0-5-RELEASE:1.1.1.4
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.4
	riastradh-drm2:1.1.1.4.0.8
	riastradh-drm2-base:1.1.1.4
	netbsd-6-1-3-RELEASE:1.1.1.4
	netbsd-6-0-4-RELEASE:1.1.1.4
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-6-1-2-RELEASE:1.1.1.4
	netbsd-6-0-3-RELEASE:1.1.1.4
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-6-1-1-RELEASE:1.1.1.4
	netbsd-6-1:1.1.1.4.0.6
	netbsd-6-0-2-RELEASE:1.1.1.4
	netbsd-6-1-RELEASE:1.1.1.4
	netbsd-6-1-RC4:1.1.1.4
	netbsd-6-1-RC3:1.1.1.4
	netbsd-6-1-RC2:1.1.1.4
	netbsd-6-1-RC1:1.1.1.4
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-6-0-1-RELEASE:1.1.1.4
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-6-0:1.1.1.4.0.4
	netbsd-6-0-RELEASE:1.1.1.4
	netbsd-6-0-RC2:1.1.1.4
	netbsd-6-0-RC1:1.1.1.4
	netbsd-6:1.1.1.4.0.2
	netbsd-6-base:1.1.1.4
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	MesaDemos-7-8-2:1.1.1.4
	netbsd-5-1-RC3:1.1.1.1.2.1
	MesaDemos-7-7-1:1.1.1.3
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	MesaDemos-7-4-4:1.1.1.2
	netbsd-5-0-1-RELEASE:1.1.1.1
	MesaDemos-7-4-2:1.1.1.2
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	MesaDemos-7-0-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.07.08.22.18.38;	author riastradh;	state dead;
branches;
next	1.1;
commitid	Rf5Rc1yRWh6FMCHx;

1.1
date	2008.07.29.05.07.10;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.07.29.05.07.10;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2009.06.11.00.49.22;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2010.05.23.21.20.59;	author mrg;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2010.07.19.05.29.18;	author mrg;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2009.09.17.03.31.59;	author snj;	state Exp;
branches;
next	;


desc
@@


1.2
log
@merge mesa-demos 8.1.0
@
text
@# progs/demos/Makefile

TOP = ../..
include $(TOP)/configs/current

INCDIR = $(TOP)/include

LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)

LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)

PROGS = \
	brick \
	bump \
	deriv \
	mandelbrot \
	noise \
	toyball \
	texdemo1


##### RULES #####

.SUFFIXES:
.SUFFIXES: .c


# make executable from .c file:
.c: $(LIB_DEP)
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@@


##### TARGETS #####

default: $(PROGS)



##### Extra dependencies

extfuncs.h:  $(TOP)/progs/util/extfuncs.h
	cp $< .

readtex.c: $(TOP)/progs/util/readtex.c
	cp $< .

readtex.h: $(TOP)/progs/util/readtex.h
	cp $< .

readtex.o: readtex.c readtex.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) readtex.c

brick.c: extfuncs.h

bump.c: extfuncs.h

mandelbrot.c: extfuncs.h

toyball.c: extfuncs.h

texdemo1: texdemo1.o readtex.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o $(LIBS) -o $@@

texdemo1.o: texdemo1.c readtex.h extfuncs.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c


clean:
	-rm -f $(PROGS)
	-rm -f *.o *~
	-rm -f extfuncs.h
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaDemos-7.0.3
@
text
@@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@a12 1
	bitmap \
a14 1
	convolutions \
a15 1
	fragcoord \
a16 2
	multinoise \
	multitex \
a17 5
	points \
	pointcoord \
	samplers \
	skinning \
	texdemo1 \
d19 1
a19 4
	twoside \
	trirast \
	vert-or-frag-only \
	vert-tex
a43 1

d53 1
d55 1
a55 66
shaderutil.c: $(TOP)/progs/util/shaderutil.c
	cp $< .

shaderutil.h: $(TOP)/progs/util/shaderutil.h
	cp $< .

shaderutil.o: shaderutil.c shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c



bitmap.o: bitmap.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) bitmap.c

bitmap: bitmap.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bitmap.o shaderutil.o $(LIBS) -o $@@


brick.o: brick.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) brick.c

brick: brick.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) brick.o shaderutil.o $(LIBS) -o $@@


bump.o: bump.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) bump.c

bump: bump.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bump.o shaderutil.o $(LIBS) -o $@@


convolutions.o: convolutions.c readtex.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c

convolutions: convolutions.o readtex.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) convolutions.o readtex.o $(LIBS) -o $@@


deriv.o: deriv.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) deriv.c

deriv: deriv.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@@


fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c

fragcoord: fragcoord.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@@


mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c

mandelbrot: mandelbrot.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@@


multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c

multitex: multitex.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@@

d57 1
a57 2
noise.o: noise.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) noise.c
d59 1
a59 2
noise: noise.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@@
d61 2
d64 1
a64 29
points.o: points.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) points.c

points: points.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) points.o shaderutil.o $(LIBS) -o $@@


pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c

pointcoord: pointcoord.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@@


samplers.o: samplers.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) samplers.c

samplers: samplers.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) samplers.o readtex.o shaderutil.o $(LIBS) -o $@@


skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) skinning.c

skinning: skinning.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@@


texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h
a66 41
texdemo1: texdemo1.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@@


toyball.o: toyball.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) toyball.c

toyball: toyball.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) toyball.o shaderutil.o $(LIBS) -o $@@


twoside.o: twoside.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) twoside.c

twoside: twoside.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) twoside.o shaderutil.o $(LIBS) -o $@@


trirast.o: trirast.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c

trirast: trirast.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@@


vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c

vert-or-frag-only: vert-or-frag-only.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@@



vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c

vert-tex: vert-tex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@@



a71 1
	-rm -f shaderutil.*
@


1.1.1.2
log
@initial import of MesaDemos-7.4.2
@
text
@a12 1
	bitmap \
a14 1
	convolutions \
a15 1
	fragcoord \
a16 2
	multinoise \
	multitex \
a17 5
	points \
	pointcoord \
	samplers \
	skinning \
	texdemo1 \
d19 1
a19 4
	twoside \
	trirast \
	vert-or-frag-only \
	vert-tex
a43 1

d53 1
d55 1
a55 66
shaderutil.c: $(TOP)/progs/util/shaderutil.c
	cp $< .

shaderutil.h: $(TOP)/progs/util/shaderutil.h
	cp $< .

shaderutil.o: shaderutil.c shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c



bitmap.o: bitmap.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) bitmap.c

bitmap: bitmap.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bitmap.o shaderutil.o $(LIBS) -o $@@


brick.o: brick.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) brick.c

brick: brick.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) brick.o shaderutil.o $(LIBS) -o $@@


bump.o: bump.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) bump.c

bump: bump.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bump.o shaderutil.o $(LIBS) -o $@@


convolutions.o: convolutions.c readtex.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c

convolutions: convolutions.o readtex.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) convolutions.o readtex.o $(LIBS) -o $@@


deriv.o: deriv.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) deriv.c

deriv: deriv.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@@


fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c

fragcoord: fragcoord.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@@


mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c

mandelbrot: mandelbrot.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@@


multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c

multitex: multitex.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@@

d57 1
a57 2
noise.o: noise.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) noise.c
d59 1
a59 2
noise: noise.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@@
d61 2
d64 1
a64 29
points.o: points.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) points.c

points: points.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) points.o shaderutil.o $(LIBS) -o $@@


pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c

pointcoord: pointcoord.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@@


samplers.o: samplers.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) samplers.c

samplers: samplers.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) samplers.o readtex.o shaderutil.o $(LIBS) -o $@@


skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) skinning.c

skinning: skinning.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@@


texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h
a66 41
texdemo1: texdemo1.o readtex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@@


toyball.o: toyball.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) toyball.c

toyball: toyball.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) toyball.o shaderutil.o $(LIBS) -o $@@


twoside.o: twoside.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) twoside.c

twoside: twoside.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) twoside.o shaderutil.o $(LIBS) -o $@@


trirast.o: trirast.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c

trirast: trirast.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@@


vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c

vert-or-frag-only: vert-or-frag-only.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@@



vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c

vert-tex: vert-tex.o shaderutil.o
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@@



a71 1
	-rm -f shaderutil.*
@


1.1.1.3
log
@initial import of MesaDemos-7.7.1
@
text
@d8 37
a44 55
LIB_DEP = \
	$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) \
	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)

LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
	-l$(GL_LIB) $(APP_LIB_DEPS)

# using : to avoid APP_CC pointing to CC loop
CC := $(APP_CC)
CFLAGS := -I$(INCDIR) $(CFLAGS)
LDLIBS = $(LIBS)

PROG_SOURCES = \
	array.c \
	bitmap.c \
	brick.c \
	bump.c \
	convolutions.c \
	deriv.c \
	fragcoord.c \
	identity.c \
	linktest.c \
	mandelbrot.c \
	multinoise.c \
	multitex.c \
	noise.c \
	noise2.c \
	pointcoord.c \
	points.c \
	samplers.c \
	samplers_array.c \
	shadow_sampler.c \
	shtest.c \
	skinning.c \
	texaaline.c \
	texdemo1.c \
	toyball.c \
	trirast.c \
	twoside.c \
	vert-or-frag-only.c \
	vert-tex.c

UTIL_HEADERS = \
	extfuncs.h \
	shaderutil.h \
	readtex.h

UTIL_SOURCES = \
	shaderutil.c \
	readtex.c

UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
PROG_OBJS = $(PROG_SOURCES:.c=.o)
PROGS = $(PROG_SOURCES:%.c=%)
a49 10
$(PROG_OBJS): $(UTIL_HEADERS)

$(PROGS): $(UTIL_OBJS)

clean:
	-rm -f $(PROGS)
	-rm -f *.o *~
	-rm -f extfuncs.h
	-rm -f shaderutil.*
	-rm -f readtex.*
d54 2
a55 2
samplers_array.o: samplers.c
	$(APP_CC) $(CFLAGS) -DSAMPLERS_ARRAY $< -c -o $@@
a56 2
extfuncs.h: $(TOP)/progs/util/extfuncs.h
	cp $< .
d64 4
d74 146
@


1.1.1.4
log
@import Mesa 7.8.2, demos component.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@a71 3
.o:
	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@@

@