X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=progs%2Fdemos%2FMakefile;h=65fdbaaad8e5d20863b924a8e8223cc37f95a10d;hb=02f2bcdf1d28f2bd6382fb6048c497ef76ba86b2;hp=467dbc5cdf9d9cd6fac0692470ec043880f5099b;hpb=e228433823b90127a217950433e31f0ef44df813;p=mesa.git

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 467dbc5cdf9..65fdbaaad8e 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -5,16 +5,10 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(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) \
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
 	$(APP_LIB_DEPS)
 
 PROGS = \
@@ -25,9 +19,11 @@ PROGS = \
 	clearspd \
 	copypix \
 	cubemap \
+	dinoshade \
 	drawpix \
 	engine \
 	fbo_firecube \
+	fbotexture \
 	fire \
 	fogcoord \
 	fplight \
@@ -38,9 +34,7 @@ PROGS = \
 	geartrain \
 	glinfo \
 	gloss \
-	glslnoise \
 	gltestperf \
-	glutfx \
 	isosurf \
 	ipers \
 	lodbias \
@@ -48,6 +42,7 @@ PROGS = \
 	multiarb \
 	paltex \
 	pointblast \
+	projtex \
 	rain \
 	ray \
 	readpix \
@@ -55,7 +50,6 @@ PROGS = \
 	renormal \
 	shadowtex \
 	singlebuffer \
-	streaming_rect \
 	spectex \
 	spriteblast \
 	stex3d \
@@ -63,9 +57,7 @@ PROGS = \
 	terrain \
 	tessdemo \
 	texcyl \
-	texdown \
 	texenv \
-	texobj \
 	textures \
 	trispd \
 	tunnel \
@@ -153,6 +145,13 @@ engine.o: engine.c trackball.h
 	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) engine.c
 
 
+fbotexture: fbotexture.o
+	$(APP_CC) $(CFLAGS) $(LDFLAGS) fbotexture.o $(LIBS) -o $@
+
+fbotexture.o: fbotexture.c extfuncs.h
+	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) fbotexture.c
+
+
 fslight: fslight.o
 	$(APP_CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@