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.3
	netbsd-6-1-5-RELEASE:1.1.1.3
	netbsd-6-1-4-RELEASE:1.1.1.3
	netbsd-6-0-5-RELEASE:1.1.1.3
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.3
	riastradh-drm2:1.1.1.3.0.8
	riastradh-drm2-base:1.1.1.3
	netbsd-6-1-3-RELEASE:1.1.1.3
	netbsd-6-0-4-RELEASE:1.1.1.3
	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.3
	netbsd-6-0-3-RELEASE:1.1.1.3
	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.3
	netbsd-6-1:1.1.1.3.0.6
	netbsd-6-0-2-RELEASE:1.1.1.3
	netbsd-6-1-RELEASE:1.1.1.3
	netbsd-6-1-RC4:1.1.1.3
	netbsd-6-1-RC3:1.1.1.3
	netbsd-6-1-RC2:1.1.1.3
	netbsd-6-1-RC1:1.1.1.3
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-6-0-1-RELEASE:1.1.1.3
	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.3.0.4
	netbsd-6-0-RELEASE:1.1.1.3
	netbsd-6-0-RC2:1.1.1.3
	netbsd-6-0-RC1:1.1.1.3
	netbsd-6:1.1.1.3.0.2
	netbsd-6-base:1.1.1.3
	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.3
	netbsd-5-1-RC3:1.1.1.1.2.1
	MesaDemos-7-7-1:1.1.1.2
	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.40;	author riastradh;	state dead;
branches;
next	1.1;
commitid	Rf5Rc1yRWh6FMCHx;

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

1.1.1.1
date	2008.07.29.05.07.08;	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.07.19.05.29.17;	author mrg;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2009.09.17.03.32.00;	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

OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS)

OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)

OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)

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 = \
	osdemo \
	ostest1


##### RULES #####

.SUFFIXES:
.SUFFIXES: .c


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


##### TARGETS #####

default: readtex.o $(PROGS)


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


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

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

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


# special case: need the -lOSMesa library:
osdemo: osdemo.c
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) osdemo.c $(OSMESA_LIBS) -o $@@

# special case: need the -lOSMesa library:
ostest1: ostest1.c
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) ostest1.c $(OSMESA_LIBS) -o $@@

# another special case: need the -lOSMesa16 library:
osdemo16: osdemo16.c
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) osdemo16.c $(OSMESA16_LIBS) -o $@@

# another special case: need the -lOSMesa32 library:
osdemo32: osdemo32.c
	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) osdemo32.c $(OSMESA32_LIBS) -o $@@



clean:
	-rm -f $(PROGS)
	-rm -f *.o *~
	-rm -f readtex.[ch] showbuffer.[ch]
	-rm -f *.ppm
	-rm -f osdemo16 osdemo32


@


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
@d8 1
a8 1
OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(OSMESA_LIB) $(APP_LIB_DEPS)
d10 1
a10 2
OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa16 -l$(GLU_LIB) \
	-l$(GL_LIB) $(APP_LIB_DEPS)
d12 1
a12 2
OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa32 -l$(GLU_LIB) \
	-l$(GL_LIB) $(APP_LIB_DEPS)
d14 1
a14 2
LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
d16 1
a16 2
LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
	$(APP_LIB_DEPS)
@


1.1.1.2
log
@initial import of MesaDemos-7.4.2
@
text
@d8 1
a8 1
OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(OSMESA_LIB) $(APP_LIB_DEPS)
d10 1
a10 2
OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa16 -l$(GLU_LIB) \
	-l$(GL_LIB) $(APP_LIB_DEPS)
d12 1
a12 2
OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa32 -l$(GLU_LIB) \
	-l$(GL_LIB) $(APP_LIB_DEPS)
d14 1
a14 2
LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
d16 1
a16 2
LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
	$(APP_LIB_DEPS)
@


1.1.1.3
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
@d16 6
d33 5
@