nv: define NV30/40/50_MAX_TEXTURE_LEVELS

[mesa.git] / progs / demos / Makefile

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 467dbc5cdf9d9cd6fac0692470ec043880f5099b..a13a272ce9c7f23f38fc0be10f8e16f4a411a74d 100644 (file)
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -5,29 +5,27 @@ 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 = \
        arbfplight \
        arbfslight \
        arbocclude \
+       arbocclude2 \
        bounce \
        clearspd \
        copypix \
        cubemap \
+       dinoshade \
+       dissolve \
        drawpix \
        engine \
        fbo_firecube \
+       fbotexture \
        fire \
        fogcoord \
        fplight \
@@ -38,9 +36,7 @@ PROGS = \
        geartrain \
        glinfo \
        gloss \
-       glslnoise \
        gltestperf \
-       glutfx \
        isosurf \
        ipers \
        lodbias \
@@ -48,6 +44,7 @@ PROGS = \
        multiarb \
        paltex \
        pointblast \
+       projtex \
        rain \
        ray \
        readpix \
@@ -55,7 +52,6 @@ PROGS = \
        renormal \
        shadowtex \
        singlebuffer \
-       streaming_rect \
        spectex \
        spriteblast \
        stex3d \
@@ -63,9 +59,7 @@ PROGS = \
        terrain \
        tessdemo \
        texcyl \
-       texdown \
        texenv \
-       texobj \
        textures \
        trispd \
        tunnel \
@@ -132,13 +126,6 @@ reflect.o: reflect.c showbuffer.h
        $(APP_CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
 
 
-shadowtex: shadowtex.o showbuffer.o
-       $(APP_CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
-
-shadowtex.o: shadowtex.c showbuffer.h
-       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
-
-
 gloss: gloss.o trackball.o readtex.o
        $(APP_CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
 
@@ -153,6 +140,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 $@