demos: move glslnoise.c demo to glsl/noise2.c

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 32c6072..43bf09c 100644 (file)
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -32,7 +32,6 @@ PROGS = \
        geartrain \
        glinfo \
        gloss \
-       glslnoise \
        gltestperf \
        glutfx \
        isosurf \

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 5fb95c4..8e61ab6 100644 (file)
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -23,6 +23,7 @@ PROGS = \
        multinoise \
        multitex \
        noise \
+       noise2 \
        points \
        pointcoord \
        samplers \
@@ -163,6 +164,13 @@ noise: noise.o shaderutil.o
        $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@
 
 
+noise2.o: noise2.c extfuncs.h shaderutil.h
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) noise2.c
+
+noise2: noise2.o shaderutil.o
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise2.o shaderutil.o $(LIBS) -o $@
+
+
 points.o: points.c extfuncs.h shaderutil.h
        $(APP_CC) -c -I$(INCDIR) $(CFLAGS) points.c
 

diff --git a/progs/demos/glslnoise.c b/progs/glsl/noise2.c
similarity index 100%
rename from progs/demos/glslnoise.c
rename to progs/glsl/noise2.c