diff options
| author | Brian Paul <brianp@vmware.com> | 2009-04-18 12:54:27 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-04-18 12:54:27 -0600 |
| commit | 118856641f4871d6f6afd1abb67ad7fe56a6814b (patch) | |
| tree | 41576f8749f40a3ea89051a4686672bf47f06706 /progs | |
| parent | 927dc39de0aa3840b6e054128f49a6882771ab19 (diff) | |
demos: move glslnoise.c demo to glsl/noise2.c
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/Makefile | 1 | ||||
| -rw-r--r-- | progs/glsl/Makefile | 8 | ||||
| -rw-r--r-- | progs/glsl/noise2.c (renamed from progs/demos/glslnoise.c) | 0 |
3 files changed, 8 insertions, 1 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 32c6072123..43bf09c0af 100644 --- 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 5fb95c4b3b..8e61ab690b 100644 --- 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 index e972b62673..e972b62673 100644 --- a/progs/demos/glslnoise.c +++ b/progs/glsl/noise2.c |