X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=9d2c7f0a11152c91b599912abb86491f8636ed41;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hp=03de047b892bbf166a1d3b39065bca68be80943b;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index 03de047b..9d2c7f0a 100644 --- a/hacks/glx/Makefile.in +++ b/hacks/glx/Makefile.in @@ -117,7 +117,8 @@ SRCS = xscreensaver-gl-helper.c normals.c glxfonts.c fps-gl.c \ hilbert.c companion.c companion_quad.c companion_disc.c \ companion_heart.c tronbit.c tronbit_idle1.c tronbit_idle2.c \ tronbit_no.c tronbit_yes.c jwzgles.c kaleidocycle.c \ - quasicrystal.c unknownpleasures.c + quasicrystal.c unknownpleasures.c geodesic.c \ + projectiveplane.c OBJS = xscreensaver-gl-helper.o normals.o glxfonts.o fps-gl.o \ atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \ @@ -157,7 +158,8 @@ OBJS = xscreensaver-gl-helper.o normals.o glxfonts.o fps-gl.o \ hilbert.o companion.o companion_quad.o companion_disc.o \ companion_heart.o tronbit.o tronbit_idle1.o tronbit_idle2.o \ tronbit_no.o tronbit_yes.o jwzgles.o kaleidocycle.o \ - quasicrystal.o unknownpleasures.o + quasicrystal.o unknownpleasures.o geodesic.o \ + projectiveplane.o GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \ morph3d rubik atlantis lament bubble3d glplanet pulsar \ @@ -173,7 +175,8 @@ GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \ juggler3d topblock glschool glcells voronoi moebiusgears \ lockward cubicgrid hypnowheel skytentacles jigsaw photopile \ rubikblocks surfaces hilbert companioncube tronbit \ - kaleidocycle quasicrystal unknownpleasures + kaleidocycle quasicrystal unknownpleasures geodesic \ + projectiveplane GLE_EXES = extrusion SUID_EXES = sonar GL_UTIL_EXES = xscreensaver-gl-helper @@ -229,13 +232,14 @@ GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \ hypnowheel.man skytentacles.man sonar.man jigsaw.man \ photopile.man rubikblocks.man surfaces.man hilbert.man \ companioncube.man tronbit.man kaleidocycle.man \ - quasicrystal.man unknownpleasures.man + quasicrystal.man unknownpleasures.man geodesic.man \ + projectiveplane.man MEN = @GL_MEN@ RETIRED_MEN = glforestfire.man EXTRAS = README Makefile.in dxf2gl.pl vrml2gl.pl wfront2gl.pl \ molecules.sh starwars.txt -TARFILES = $(SRCS) $(HDRS) $(MEN) $(RETIRED_MEN) $(EXTRAS) +TARFILES = $(SRCS) $(HDRS) $(GL_MEN) $(RETIRED_MEN) $(EXTRAS) default: all @@ -446,7 +450,7 @@ check_men: validate_xml: @echo "Validating XML..." ; \ - cd $(HACK_SRC) ; ./check-configs.pl $(EXES) + cd $(HACK_SRC) ; ./check-configs.pl $(GL_EXES) $(GLE_EXES) $(SUID_EXES) distdepend:: check_men validate_xml @@ -476,7 +480,7 @@ $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c # How we build object files in this directory. .c.o: - $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $< # How to build the "xscreensaver-gl-helper" program, that lets the daemon @@ -491,7 +495,7 @@ xscreensaver-gl-helper: $(HELPER_OBJS) # These hacks use a slightly-differently-compiled variant of xlockmore.c. # This is how to make the the other .o file from it. # -XLM_CFLAGS=-DUSE_GL $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) +XLM_CFLAGS=-DUSE_GL $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) xlockmore-gl.o: $(HACK_SRC)/xlockmore.c $(CC) -o $@ -c $(XLM_CFLAGS) $(HACK_SRC)/xlockmore.c @@ -664,6 +668,9 @@ surfaces: surfaces.o $(HACK_TRACK_OBJS) hypertorus: hypertorus.o $(HACK_TRACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_TRACK_OBJS) $(HACK_LIBS) +projectiveplane: projectiveplane.o $(HACK_TRACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_TRACK_OBJS) $(HACK_LIBS) + glmatrix: glmatrix.o xpm-ximage.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o xpm-ximage.o $(HACK_OBJS) $(XPM_LIBS) @@ -831,6 +838,8 @@ quasicrystal: quasicrystal.o $(HACK_TRACK_OBJS) unknownpleasures: unknownpleasures.o $(HACK_TRACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_TRACK_OBJS) $(HACK_LIBS) +geodesic: geodesic.o normals.o $(HACK_TRACK_OBJS) + $(CC_HACK) -o $@ $@.o normals.o $(HACK_TRACK_OBJS) $(HACK_LIBS) ############################################################################## # @@ -1575,6 +1584,25 @@ gears.o: $(UTILS_SRC)/xshm.h gears.o: $(UTILS_SRC)/yarandom.h gears.o: $(HACK_SRC)/xlockmoreI.h gears.o: $(HACK_SRC)/xlockmore.h +geodesic.o: ../../config.h +geodesic.o: $(HACK_SRC)/fps.h +geodesic.o: $(srcdir)/gllist.h +geodesic.o: $(srcdir)/gltrackball.h +geodesic.o: $(srcdir)/jwzglesI.h +geodesic.o: $(srcdir)/jwzgles.h +geodesic.o: $(srcdir)/normals.h +geodesic.o: $(srcdir)/rotator.h +geodesic.o: $(HACK_SRC)/screenhackI.h +geodesic.o: $(UTILS_SRC)/colors.h +geodesic.o: $(UTILS_SRC)/grabscreen.h +geodesic.o: $(UTILS_SRC)/hsv.h +geodesic.o: $(UTILS_SRC)/resources.h +geodesic.o: $(UTILS_SRC)/usleep.h +geodesic.o: $(UTILS_SRC)/visual.h +geodesic.o: $(UTILS_SRC)/xshm.h +geodesic.o: $(UTILS_SRC)/yarandom.h +geodesic.o: $(HACK_SRC)/xlockmoreI.h +geodesic.o: $(HACK_SRC)/xlockmore.h gflux.o: ../../config.h gflux.o: $(HACK_SRC)/fps.h gflux.o: $(srcdir)/gltrackball.h @@ -2297,6 +2325,22 @@ polytopes.o: $(UTILS_SRC)/xshm.h polytopes.o: $(UTILS_SRC)/yarandom.h polytopes.o: $(HACK_SRC)/xlockmoreI.h polytopes.o: $(HACK_SRC)/xlockmore.h +projectiveplane.o: ../../config.h +projectiveplane.o: $(HACK_SRC)/fps.h +projectiveplane.o: $(srcdir)/gltrackball.h +projectiveplane.o: $(srcdir)/jwzglesI.h +projectiveplane.o: $(srcdir)/jwzgles.h +projectiveplane.o: $(HACK_SRC)/screenhackI.h +projectiveplane.o: $(UTILS_SRC)/colors.h +projectiveplane.o: $(UTILS_SRC)/grabscreen.h +projectiveplane.o: $(UTILS_SRC)/hsv.h +projectiveplane.o: $(UTILS_SRC)/resources.h +projectiveplane.o: $(UTILS_SRC)/usleep.h +projectiveplane.o: $(UTILS_SRC)/visual.h +projectiveplane.o: $(UTILS_SRC)/xshm.h +projectiveplane.o: $(UTILS_SRC)/yarandom.h +projectiveplane.o: $(HACK_SRC)/xlockmoreI.h +projectiveplane.o: $(HACK_SRC)/xlockmore.h providence.o: ../../config.h providence.o: $(HACK_SRC)/fps.h providence.o: $(srcdir)/gltrackball.h