Merge branch 'master' into i915-unification

[mesa.git] / progs / demos / Makefile

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 8240b9fc47ee4b6eab09751bc1cacf3ed3094c6c..7bfcefd02d1cd0eb8e5d5bf454d3a281a8ff91a8 100644 (file)
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -5,29 +5,35 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 
-OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
 
-OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
 
-LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = \
        arbfplight \
+       arbfslight \
        arbocclude \
        bounce \
        clearspd \
+       copypix \
        cubemap \
        drawpix \
+       engine \
        fire \
        fogcoord \
        fplight \
+       fslight \
        gamma \
+       gearbox \
        gears \
        geartrain \
        glinfo \
        gloss \
+       glslnoise \
        gltestperf \
        glutfx \
        isosurf \
@@ -35,7 +41,6 @@ PROGS = \
        lodbias \
        morph3d \
        multiarb \
-       occlude \
        paltex \
        pointblast \
        ray \
@@ -44,6 +49,7 @@ PROGS = \
        renormal \
        shadowtex \
        singlebuffer \
+       streaming_rect \
        spectex \
        spriteblast \
        stex3d \
@@ -57,6 +63,7 @@ PROGS = \
        trispd \
        tunnel \
        tunnel2 \
+       vao_demo \
        winpos
 
 
@@ -73,8 +80,9 @@ PROGS = \
 
 ##### TARGETS #####
 
-default: readtex.o $(PROGS)
+default: $(PROGS)
 
+$(PROGS): readtex.o
 
 readtex.c: $(TOP)/progs/util/readtex.c
        cp $< .
@@ -96,19 +104,60 @@ showbuffer.o: showbuffer.c showbuffer.h
        $(CC) -c -I$(INCDIR) $(CFLAGS) showbuffer.c
 
 
+trackball.c: $(TOP)/progs/util/trackball.c
+       cp $< .
+
+trackball.h: $(TOP)/progs/util/trackball.h
+       cp $< .
+
+trackball.o: trackball.c trackball.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) trackball.c
+
+
+extfuncs.h:  $(TOP)/progs/util/extfuncs.h
+       cp $< .
+
+
 reflect: reflect.o showbuffer.o readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) -o $@
+       $(CC) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) -o $@
 
 reflect.o: reflect.c showbuffer.h
        $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
 
 
 shadowtex: shadowtex.o showbuffer.o
-       $(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(APP_LIB_DEPS) -o $@
+       $(CC) shadowtex.o showbuffer.o $(APP_LIB_DEPS) -o $@
 
 shadowtex.o: shadowtex.c showbuffer.h
        $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
 
+
+gloss: gloss.o trackball.o readtex.o
+       $(CC) gloss.o trackball.o readtex.o $(APP_LIB_DEPS) -o $@
+
+gloss.o: gloss.c trackball.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
+
+
+engine: engine.o trackball.o readtex.o
+       $(CC) engine.o trackball.o readtex.o $(APP_LIB_DEPS) -o $@
+
+engine.o: engine.c trackball.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) engine.c
+
+
+fslight: fslight.o
+       $(CC) fslight.o $(APP_LIB_DEPS) -o $@
+
+fslight.o: fslight.c extfuncs.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
+
+
+
+viewdds: viewdds.c
+       $(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -L. -lgltc -o $@
+
+
 clean:
        -rm -f $(PROGS)
        -rm -f *.o *~