clean up usage of extension function pointers

[mesa.git] / progs / demos / Makefile.win

diff --git a/progs/demos/Makefile.win b/progs/demos/Makefile.win
index 02efb7f6ed0b1d6748ab86aed402d9c12230d9f7..188ca2f6734666093acbbd33fa1db93e56cbd838 100644 (file)
--- a/progs/demos/Makefile.win
+++ b/progs/demos/Makefile.win
@@ -1,8 +1,8 @@
-# $Id: Makefile.win,v 1.3 2001/09/18 20:47:23 kschultz Exp $
+# $Id: Makefile.win,v 1.8 2003/04/17 19:20:55 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
-# Copyright (C) 1995-2001  Brian Paul
+# Version:  5.1
+# Copyright (C) 1995-2003  Brian Paul
 
 # Makefile for GLUT-based demo programs for Windows
 
@@ -14,12 +14,14 @@ TOP    = ..
 INCDIR = ..\include
 LIBDIR = ..\lib
 
-PROGS = anisotropic \
+PROGS = \
+       arbfplight \
        bounce \
        clearspd \
        cubemap \
        drawpix \
        fire \
+       fplight \
        gamma \
        gears \
        geartrain \
@@ -56,31 +58,75 @@ PROGS = anisotropic \
        tunnel2 \
        winpos
 
-SRCS =
-OSMESASRCS = osdemo.c
+SRCS = \
+       bounce.c \
+       clearspd.c \
+       cubemap.c \
+       drawpix.c \
+       fire.c \
+       gamma.c \
+       gears.c \
+       geartrain.c \
+       glinfo.c \
+       gloss.c \
+       gltestperf.c \
+       glutfx.c \
+       isosurf.c \
+       lodbias.c \
+       morph3d.c \
+       multiarb.c \
+       occlude.c \
+       paltex.c \
+       pixeltex.c \
+       pointblast.c \
+       ray.c \
+       readpix.c \
+       reflect.c \
+       renormal.c \
+       shadowtex.c \
+       spectex.c \
+       stex3d.c \
+       teapot.c \
+       terrain.c \
+       tessdemo.c \
+       texcyl.c \
+       texdown.c \
+       texenv.c \
+       texobj.c \
+       trispd.c \
+       tunnel.c \
+       tunnel2.c \
+       winpos.c
+
+CXXSRCS = \
+       rain.cxx
 
+OSMESASRCS = osdemo.c
+IPERSSRCS = ipers.c
+IPERSEXES = $(IPERSSRCS:.c=.exe)
 !include "../mesawin32.mak"
 
 ##### TARGETS #####
 
 clean::
 
-realclean::
+clobber::
+       @del readtex.c readtex.h
 
-targets: readtex.c readtex.h $(PROGS)
-
-# remove comments when we get non-osmesa pgm working
-#$(EXES) : $*.obj
-#      @echo $@
-#      $(link) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS)
+$(EXES) : $*.obj readtex.c readtex.h
+       @echo $@
+       $(link) -out:$@ $* /LIBPATH:$(LIBDIR) $(LIBS)
 
 $(OSMESAEXES) : $*.obj
        @echo $@
-       $(link) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS) $(EXTRALIBS)
+       $(link) $(lcommon) -out:$@ $* /LIBPATH:$(LIBDIR) $(LIBS) $(EXTRALIBS)
+
+$(IPERSEXES) : $*.obj
+       @echo $@
+       $(link) -out:$@ $* /LIBPATH:$(LIBDIR) $(LIBS) winmm.lib
 
 readtex.c:
-       @copy ../util/readtex.c .
+       -copy ..\util\readtex.c .
 
 readtex.h:
-       @copy ../util/readtex.c .
-
+       -copy ..\util\readtex.h .
\ No newline at end of file