173 lines
7.9 KiB
Diff
173 lines
7.9 KiB
Diff
diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am
|
|
index 41603fa..b86558a 100644
|
|
--- a/src/demos/Makefile.am
|
|
+++ b/src/demos/Makefile.am
|
|
@@ -41,7 +41,6 @@ bin_PROGRAMS = \
|
|
copypix \
|
|
cubemap \
|
|
cuberender \
|
|
- dinoshade \
|
|
dissolve \
|
|
drawpix \
|
|
engine \
|
|
@@ -65,7 +64,6 @@ bin_PROGRAMS = \
|
|
multiarb \
|
|
paltex \
|
|
pixeltest \
|
|
- pointblast \
|
|
projtex \
|
|
ray \
|
|
readpix \
|
|
@@ -74,7 +72,6 @@ bin_PROGRAMS = \
|
|
shadowtex \
|
|
singlebuffer \
|
|
spectex \
|
|
- spriteblast \
|
|
stex3d \
|
|
teapot \
|
|
terrain \
|
|
diff --git a/src/demos/Makefile.in b/src/demos/Makefile.in
|
|
index 6dc4e0a..a0c94db 100644
|
|
--- a/src/demos/Makefile.in
|
|
+++ b/src/demos/Makefile.in
|
|
@@ -116,7 +116,7 @@ host_triplet = @host@
|
|
@HAVE_GLUT_TRUE@ arbocclude$(EXEEXT) arbocclude2$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ bounce$(EXEEXT) clearspd$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ copypix$(EXEEXT) cubemap$(EXEEXT) \
|
|
-@HAVE_GLUT_TRUE@ cuberender$(EXEEXT) dinoshade$(EXEEXT) \
|
|
+@HAVE_GLUT_TRUE@ cuberender$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ dissolve$(EXEEXT) drawpix$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ engine$(EXEEXT) fbo_firecube$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ fbotexture$(EXEEXT) fire$(EXEEXT) \
|
|
@@ -128,11 +128,11 @@ host_triplet = @host@
|
|
@HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
|
|
-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \
|
|
+@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
|
|
-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \
|
|
+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \
|
|
@HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \
|
|
@@ -184,9 +184,6 @@ cubemap_DEPENDENCIES = ../util/libutil.la
|
|
cuberender_SOURCES = cuberender.c
|
|
cuberender_OBJECTS = cuberender.$(OBJEXT)
|
|
cuberender_DEPENDENCIES = ../util/libutil.la
|
|
-dinoshade_SOURCES = dinoshade.c
|
|
-dinoshade_OBJECTS = dinoshade.$(OBJEXT)
|
|
-dinoshade_LDADD = $(LDADD)
|
|
dissolve_SOURCES = dissolve.c
|
|
dissolve_OBJECTS = dissolve.$(OBJEXT)
|
|
dissolve_DEPENDENCIES = ../util/libutil.la
|
|
@@ -256,9 +253,6 @@ paltex_LDADD = $(LDADD)
|
|
pixeltest_SOURCES = pixeltest.c
|
|
pixeltest_OBJECTS = pixeltest.$(OBJEXT)
|
|
pixeltest_LDADD = $(LDADD)
|
|
-pointblast_SOURCES = pointblast.c
|
|
-pointblast_OBJECTS = pointblast.$(OBJEXT)
|
|
-pointblast_LDADD = $(LDADD)
|
|
projtex_SOURCES = projtex.c
|
|
projtex_OBJECTS = projtex.$(OBJEXT)
|
|
projtex_DEPENDENCIES = ../util/libutil.la
|
|
@@ -283,9 +277,6 @@ singlebuffer_LDADD = $(LDADD)
|
|
spectex_SOURCES = spectex.c
|
|
spectex_OBJECTS = spectex.$(OBJEXT)
|
|
spectex_LDADD = $(LDADD)
|
|
-spriteblast_SOURCES = spriteblast.c
|
|
-spriteblast_OBJECTS = spriteblast.$(OBJEXT)
|
|
-spriteblast_LDADD = $(LDADD)
|
|
stex3d_SOURCES = stex3d.c
|
|
stex3d_OBJECTS = stex3d.$(OBJEXT)
|
|
stex3d_LDADD = $(LDADD)
|
|
@@ -358,23 +349,23 @@ am__v_CCLD_0 = @echo " CCLD " $@;
|
|
am__v_CCLD_1 =
|
|
SOURCES = arbfplight.c arbfslight.c arbocclude.c arbocclude2.c \
|
|
bounce.c clearspd.c copypix.c cubemap.c cuberender.c \
|
|
- dinoshade.c dissolve.c drawpix.c engine.c fbo_firecube.c \
|
|
+ dissolve.c drawpix.c engine.c fbo_firecube.c \
|
|
fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
|
|
gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
|
|
ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
|
|
- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
|
|
- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
|
|
+ pixeltest.c projtex.c ray.c readpix.c reflect.c \
|
|
+ renormal.c shadowtex.c singlebuffer.c spectex.c \
|
|
stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
|
|
textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
|
|
winpos.c
|
|
DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c arbocclude2.c \
|
|
bounce.c clearspd.c copypix.c cubemap.c cuberender.c \
|
|
- dinoshade.c dissolve.c drawpix.c engine.c fbo_firecube.c \
|
|
+ dissolve.c drawpix.c engine.c fbo_firecube.c \
|
|
fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
|
|
gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
|
|
ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
|
|
- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
|
|
- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
|
|
+ pixeltest.c projtex.c ray.c readpix.c reflect.c \
|
|
+ renormal.c shadowtex.c singlebuffer.c spectex.c \
|
|
stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
|
|
textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
|
|
winpos.c
|
|
@@ -719,10 +710,6 @@ cuberender$(EXEEXT): $(cuberender_OBJECTS) $(cuberender_DEPENDENCIES) $(EXTRA_cu
|
|
@rm -f cuberender$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(cuberender_OBJECTS) $(cuberender_LDADD) $(LIBS)
|
|
|
|
-dinoshade$(EXEEXT): $(dinoshade_OBJECTS) $(dinoshade_DEPENDENCIES) $(EXTRA_dinoshade_DEPENDENCIES)
|
|
- @rm -f dinoshade$(EXEEXT)
|
|
- $(AM_V_CCLD)$(LINK) $(dinoshade_OBJECTS) $(dinoshade_LDADD) $(LIBS)
|
|
-
|
|
dissolve$(EXEEXT): $(dissolve_OBJECTS) $(dissolve_DEPENDENCIES) $(EXTRA_dissolve_DEPENDENCIES)
|
|
@rm -f dissolve$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(dissolve_OBJECTS) $(dissolve_LDADD) $(LIBS)
|
|
@@ -815,10 +802,6 @@ pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixel
|
|
@rm -f pixeltest$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
|
|
|
|
-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES)
|
|
- @rm -f pointblast$(EXEEXT)
|
|
- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
|
|
-
|
|
projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES)
|
|
@rm -f projtex$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
|
|
@@ -851,10 +834,6 @@ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEP
|
|
@rm -f spectex$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
|
|
|
|
-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES)
|
|
- @rm -f spriteblast$(EXEEXT)
|
|
- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
|
|
-
|
|
stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES)
|
|
@rm -f stex3d$(EXEEXT)
|
|
$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
|
|
@@ -918,7 +897,6 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copypix.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cubemap.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cuberender.Po@am__quote@
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dinoshade.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dissolve.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawpix.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/engine.Po@am__quote@
|
|
@@ -942,7 +920,6 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
|
|
@@ -951,7 +928,6 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
|