Changeset 3031 for trunk/src/opengl

Timestamp:

Mar 7, 2000, 12:39:20 AM (25 years ago)

Author:

bird

Message:

Makefiles are updated to new style.
Odin32 resource files are renamed to *.orc and most have changed name to avoid
name clashes for object files.

Location:

trunk/src/opengl

Files:

• glide/cvg/glide/glide.rc (deleted)
• glide/cvg/glide/glidersrc.orc (added)
• glide/cvg/glide/makefile (modified) (1 diff)
• glide/cvg/init/init.orc (added)
• glide/cvg/init/init.rc (deleted)
• glide/cvg/init/makefile (modified) (1 diff)
• glide/cvg/makefile (modified) (2 diffs)
• glide/cvg/texus/makefile (modified) (2 diffs)
• glide/makefile (modified) (1 diff)
• glide/sst1/glide/glide.rc (deleted)
• glide/sst1/glide/glidersrc.orc (added)
• glide/sst1/glide/makefile (modified) (1 diff)
• glide/sst1/init/initvg/init.orc (added)
• glide/sst1/init/initvg/init.rc (deleted)
• glide/sst1/init/initvg/makefile (modified) (2 diffs)
• glide/sst1/init/makefile (modified) (2 diffs)
• glide/sst1/makefile (modified) (3 diffs)
• glide/sst1/texus/makefile (modified) (1 diff)
• glide/swlibs/pcilib/makefile (modified) (2 diffs)
• glu/glu32.rc (deleted)
• glu/glu32rsrc.orc (added)
• glu/makefile (modified) (3 diffs)
• glu/nurbs/interface/makefile (modified) (2 diffs)
• glu/nurbs/internals/makefile (modified) (1 diff)
• glu/nurbs/makefile (modified) (1 diff)
• glu/nurbs/nurbtess/makefile (modified) (1 diff)
• glu/tess/makefile (modified) (1 diff)
• glu/util/makefile (modified) (1 diff)
• glut/Makefile (modified) (2 diffs)
• glut/glut32.rc (deleted)
• glut/glut32rsrc.orc (added)
• makefile (modified) (1 diff)
• mesa/3dfx/fxMesa32.orc (added)
• mesa/3dfx/fxMesa32.rc (deleted)
• mesa/3dfx/makefile (modified) (4 diffs)
• mesa/mesarsrc.orc (added)
• mesa/opengl32.rc (deleted)

trunk/src/opengl/glide/cvg/glide/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:43 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=glide
+# Local cleanup only.
+LOCALCLEAN = 1
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) /Os-
+# Flag overloads and local macros.
+CLEANEXTRAS = glidersrc.asm
+
+CINCLUDE = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
+CFLAGS   = $(CFLAGS) $(CINCLUDE) /Os-
 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) /Os-
-
-OBJS =  CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
-        DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
-        GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
-        GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
-        GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
-        P6FENCE.OBJ     FIFO.OBJ
+RCFLAGS  = $(RCFLAGS) $(CINCLUDE)
 
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\CPUDTECT.OBJ \
+$(OBJDIR)\DDGUMP.OBJ \
+$(OBJDIR)\DIGLIDE.OBJ \
+$(OBJDIR)\DIGUTEX.OBJ \
+$(OBJDIR)\DISST.OBJ \
+$(OBJDIR)\DITEX.OBJ \
+$(OBJDIR)\G3DF.OBJ \
+$(OBJDIR)\GAA.OBJ \
+$(OBJDIR)\GBANNER.OBJ \
+$(OBJDIR)\GDRAW.OBJ \
+$(OBJDIR)\GERROR.OBJ \
+$(OBJDIR)\GGLIDE.OBJ \
+$(OBJDIR)\GLFB.OBJ \
+$(OBJDIR)\GMOVIE.OBJ \
+$(OBJDIR)\GPCI.OBJ \
+$(OBJDIR)\GSPLASH.OBJ \
+$(OBJDIR)\GSST.OBJ \
+$(OBJDIR)\GTEX.OBJ \
+$(OBJDIR)\GTEXDL.OBJ \
+$(OBJDIR)\GU.OBJ \
+$(OBJDIR)\GUCLIP.OBJ \
+$(OBJDIR)\GUMP.OBJ \
+$(OBJDIR)\GUTEX.OBJ \
+$(OBJDIR)\GXDRAW.OBJ \
+$(OBJDIR)\P6FENCE.OBJ \
+$(OBJDIR)\FIFO.OBJ \
+$(OBJDIR)\glidersrc.obj
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = glide
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/cvg/init/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:37:52 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
 #
 # PD-Win32 API
 #
-#       Glide makefile
+#       Init makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
+PDWIN32_BIN = ..\..\..\..\..\$(OBJDIR)
 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
+LOCALCLEAN  = 1
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-TARGET=init
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS =  DAC.OBJ GAMMA.OBJ GDEBUG.OBJ INFO.OBJ PARSE.OBJ \
-        PRINT.OBJ SLI.OBJ SST1INIT.OBJ UTIL.OBJ VIDEO.OBJ
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\DAC.OBJ \
+$(OBJDIR)\GAMMA.OBJ \
+$(OBJDIR)\GDEBUG.OBJ \
+$(OBJDIR)\INFO.OBJ \
+$(OBJDIR)\PARSE.OBJ \
+$(OBJDIR)\PRINT.OBJ \
+$(OBJDIR)\SLI.OBJ \
+$(OBJDIR)\SST1INIT.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIDEO.OBJ
 
-all: $(TARGET).lib
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS),,
+# Target name - name of the dll without extention and path.
+TARGET  = init
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib target rule - builds the library.
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
 
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/cvg/makefile

@@ -1 @@
-# $Id: makefile,v 1.6 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.7 2000-03-06 23:33:43 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       Glide\cvg makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
+
+# Have extra clean rule.
+CLEAN2 = 1
+
+
+# Compiler, tools, and interference rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.mk
+
+
+# Flag overloads and local macros.
+CLEANEXTRAS = rsrc.asm
+
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = glide2x
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
-        glide\glide.lib \
 
-all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-..\swlibs\pcilib\pcilib.lib:
+
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
     cd ..\swlibs\pcilib
-    $(MAKE_CMD)
-    cd ..\..\cvg
-
-init\init.lib:
-    cd init
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\..\cvg\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\texus
+    $(MAKE_CMD) $@
     cd ..
 
-glide\glide.lib:
-    cd glide
-    $(MAKE_CMD)
-    cd ..
 
-texus\texus.lib:
-    cd texus
-    $(MAKE_CMD)
-    cd ..
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo2
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
+texus\$(OBJDIR)\texus.lib
+init\$(OBJDIR)\init.lib
+glide\$(OBJDIR)\glide.lib
+$(PDWIN32_LIB)\kernel32.lib
+$(PDWIN32_LIB)\odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+
+# Copy rule - copies the dll.
+$(PDWIN32_BIN)\Glide\Voodoo2\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
     $(CP) $** $@
 
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
-    $(CP) $@ $(PDWIN32_LIB)
 
-RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
-
-glideres.asm: glide\glide.rc
-    $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
-
-initterm.obj: initterm.cpp
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) dep
-    cd ..\..\cvg\glide
-    $(MAKE_CMD) dep
-    cd ..\init
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..\..\cvg\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
     cd ..\texus
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.map *.dll
-    $(RM) *.lib
-    $(RM) glideres.asm
+# Extra cleanrule.
+clean2:
     cd ..\swlibs\pcilib
     $(MAKE_CMD) clean
@@ -101 +115 @@
     cd ..
 
+
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+

trunk/src/opengl/glide/cvg/texus/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:37:59 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
 #
 # PD-Win32 API
@@ -6 +6 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=TEXUS
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS =  3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
-        MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
-        QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
-        TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-all: $(TARGET).lib
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\3DF.OBJ \
+$(OBJDIR)\CLAMP.OBJ \
+$(OBJDIR)\DEQUANT.OBJ \
+$(OBJDIR)\DIFFUSE.OBJ \
+$(OBJDIR)\GLDUTIL.OBJ \
+$(OBJDIR)\MIPMAP.OBJ \
+$(OBJDIR)\NCC.OBJ \
+$(OBJDIR)\NCCNNET.OBJ \
+$(OBJDIR)\PAL256.OBJ \
+$(OBJDIR)\PPM.OBJ \
+$(OBJDIR)\QUANTIZE.OBJ \
+$(OBJDIR)\READ.OBJ \
+$(OBJDIR)\RESAMPLE.OBJ \
+$(OBJDIR)\RGT.OBJ \
+$(OBJDIR)\TEXUSLIB.OBJ \
+$(OBJDIR)\TGA.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIEW.OBJ \
+$(OBJDIR)\WRITE.OBJ
 
+
+# Target name - name of the library without extention and path.
+TARGET = texus
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-03-04 20:03:42 bird Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:43 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       main glide makefile
 #
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+# Directories
+PDWIN32_INCLUDE = ..\..\include
+
+# Common tools macros. (MAKE_CMD)
+!include ..\..\..\include\pdwin32.tools
 
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-TARGET1 = cvg\glide2x
-TARGET2 = sst1\glide2x
-
-all: $(TARGET1).dll $(TARGET2).dll
-lib: $(TARGET1).lib
-
-$(TARGET1).dll:
+# All, Lib, Clean and Dep rules.
+all lib clean dep:
     cd cvg
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\sst1
+    $(MAKE_CMD) $@
     cd ..
 
-$(TARGET2).dll:
-    cd sst1
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET1).lib:
-    cd cvg
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-clean:
-    cd cvg
-    $(MAKE_CMD) clean
-    cd ..\sst1
-    $(MAKE_CMD) clean
-    cd ..
-
-dep:
-    cd cvg
-    $(MAKE_CMD) dep
-    cd ..\sst1
-    $(MAKE_CMD) dep
-    cd ..
-

trunk/src/opengl/glide/sst1/glide/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:20 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:45 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=glide
+# Local cleanup only.
+LOCALCLEAN = 1
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = glidersrc.asm
 
-OBJS =  CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
-        DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
-        GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
-        GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
-        GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
-        P6FENCE.OBJ     SST96.OBJ
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
+RCFLAGS     = $(RCFLAGS) $(CINCLUDE)
 
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\CPUDTECT.OBJ \
+$(OBJDIR)\DDGUMP.OBJ \
+$(OBJDIR)\DIGLIDE.OBJ \
+$(OBJDIR)\DIGUTEX.OBJ \
+$(OBJDIR)\DISST.OBJ \
+$(OBJDIR)\DITEX.OBJ \
+$(OBJDIR)\G3DF.OBJ \
+$(OBJDIR)\GAA.OBJ \
+$(OBJDIR)\GBANNER.OBJ \
+$(OBJDIR)\GDRAW.OBJ \
+$(OBJDIR)\GERROR.OBJ \
+$(OBJDIR)\GGLIDE.OBJ \
+$(OBJDIR)\GLFB.OBJ \
+$(OBJDIR)\GMOVIE.OBJ \
+$(OBJDIR)\GPCI.OBJ \
+$(OBJDIR)\GSPLASH.OBJ \
+$(OBJDIR)\GSST.OBJ \
+$(OBJDIR)\GTEX.OBJ \
+$(OBJDIR)\GTEXDL.OBJ \
+$(OBJDIR)\GU.OBJ \
+$(OBJDIR)\GUCLIP.OBJ \
+$(OBJDIR)\GUMP.OBJ \
+$(OBJDIR)\GUTEX.OBJ \
+$(OBJDIR)\GXDRAW.OBJ \
+$(OBJDIR)\P6FENCE.OBJ \
+$(OBJDIR)\SST96.OBJ \
+$(OBJDIR)\glidersrc.obj
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = glide
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/sst1/init/initvg/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:33 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
 #
 # PD-Win32 API
@@ -6 +6 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\..\tools\bin
 
+
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\..\3dfx.mak
 
-CINCLUDE=-I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = glide.asm
 
-OBJS =  DAC.OBJ         GAMMA.OBJ       GDEBUG.OBJ      INFO.OBJ        PARSE.OBJ \
-        PRINT.OBJ       SLI.OBJ         SST1INIT.OBJ    UTIL.OBJ        VIDEO.OBJ
+CINCLUDE    = -I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-all: $(OBJS)
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\DAC.OBJ \
+$(OBJDIR)\GAMMA.OBJ \
+$(OBJDIR)\GDEBUG.OBJ \
+$(OBJDIR)\INFO.OBJ \
+$(OBJDIR)\PARSE.OBJ \
+$(OBJDIR)\PRINT.OBJ \
+$(OBJDIR)\SLI.OBJ \
+$(OBJDIR)\SST1INIT.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIDEO.OBJ
+
+
+# All - rule make all objects.
+all:    $(OBJDIR) \
+        $(OBJS)
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h 
+        ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h \
+        ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/sst1/init/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:46 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       sst1\Init makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
+# Local cleanup only and extra cleanrule.
+LOCALCLEAN = 1
+CLEAN2     = 1
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-TARGET1=init
-TARGET2=initvg
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
-
-OBJS =  H3DRVR.OBJ      INIT.OBJ        VG96DRVR.OBJ    VGDRVR.OBJ \
-        $(TARGET2)\DAC.OBJ         $(TARGET2)\GAMMA.OBJ       $(TARGET2)\GDEBUG.OBJ      $(TARGET2)\INFO.OBJ        $(TARGET2)\PARSE.OBJ \
-        $(TARGET2)\PRINT.OBJ       $(TARGET2)\SLI.OBJ         $(TARGET2)\SST1INIT.OBJ    $(TARGET2)\UTIL.OBJ        $(TARGET2)\VIDEO.OBJ
-
-all: $(TARGET2).lib $(TARGET1).lib
-
-$(TARGET1).lib: $(OBJS)
-        $(RM) $(TARGET1).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET1).lib $(OBJS),,
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
 
-$(TARGET2).lib:
-    cd initvg
-    $(MAKE_CMD)
+# Object files. All objects should be prefixed with $(OBJDIR)!
+INITSUB = initvg
+OBJS = \
+$(OBJDIR)\H3DRVR.OBJ \
+$(OBJDIR)\INIT.OBJ \
+$(OBJDIR)\VG96DRVR.OBJ \
+$(OBJDIR)\VGDRVR.OBJ
+
+# More object files
+OBJSSUB = \
+$(INITSUB)\$(OBJDIR)\DAC.OBJ \
+$(INITSUB)\$(OBJDIR)\GAMMA.OBJ \
+$(INITSUB)\$(OBJDIR)\GDEBUG.OBJ \
+$(INITSUB)\$(OBJDIR)\INFO.OBJ \
+$(INITSUB)\$(OBJDIR)\PARSE.OBJ \
+$(INITSUB)\$(OBJDIR)\PRINT.OBJ \
+$(INITSUB)\$(OBJDIR)\SLI.OBJ \
+$(INITSUB)\$(OBJDIR)\SST1INIT.OBJ \
+$(INITSUB)\$(OBJDIR)\UTIL.OBJ \
+$(INITSUB)\$(OBJDIR)\VIDEO.OBJ
+
+
+# Target name - name of the library without extention and path.
+TARGET  = init
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        initsub \
+        $(OBJDIR)\$(TARGET).lib \
+
+
+# Make objectfiles in subdirectories.
+initsub:
+    cd $(INITSUB)
+    $(MAKE_CMD) all
     cd ..
 
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS) $(OBJSSUB);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
@@ -43 +84 @@
         ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h initvg\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
     cd initvg
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+# extra clean rule
+clean2:
     cd initvg
     $(MAKE_CMD) clean
     cd ..
-

trunk/src/opengl/glide/sst1/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:44 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       sst1\Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\lib
@@ -11 +13 @@
 PDWIN32_TOOLS = ..\..\..\..\tools\bin
 
+
+# Have extra clean rule.
+CLEAN2 = 1
+
+# Compiler, tools, and interference rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.mk
+
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = glide2x
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        libs \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
-        glide\glide.lib \
 
-all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-..\swlibs\pcilib\pcilib.lib:
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
     cd ..\swlibs\pcilib
-    $(MAKE_CMD)
-    cd ..\..\sst1
-
-init\init.lib:
-    cd init
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\..\sst1\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\texus
+    $(MAKE_CMD) $@
     cd ..
 
-glide\glide.lib:
-    cd glide
-    $(MAKE_CMD)
-    cd ..
-
-texus\texus.lib:
-    cd texus
-    $(MAKE_CMD)
-    cd ..
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
@@ -51 +59 @@
           $(PDWIN32_LIB)/kernel32.lib \
           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo1
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
+texus\$(OBJDIR)\texus.lib
+init\$(OBJDIR)\init.lib
+glide\$(OBJDIR)\glide.lib
+$(PDWIN32_LIB)\kernel32.lib
+$(PDWIN32_LIB)\odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Copy rule.
+$(PDWIN32_BIN)\Glide\Voodoo1\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
     $(CP) $** $@
 
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
-    $(CP) $@ $(PDWIN32_LIB)
 
-RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
-
-glideres.asm: glide\glide.rc
-    $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
-
-initterm.obj: initterm.cpp
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) dep
-    cd ..\..\sst1\glide
-    $(MAKE_CMD) dep
-    cd ..\init
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..\..\sst1\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
     cd ..\texus
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.map *.dll
-    $(RM) *.lib
-    $(RM) glideres.asm
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+# Extra clean rule
+clean2:
     cd ..\swlibs\pcilib
     $(MAKE_CMD) clean
-    cd ..\..\sst1\glide
+    cd ..\..\sst1\init
     $(MAKE_CMD) clean
-    cd ..\init
+    cd ..\glide
     $(MAKE_CMD) clean
     cd ..\texus

trunk/src/opengl/glide/sst1/texus/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:37 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       Texus makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=TEXUS
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS =  3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
-        MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
-        QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
-        TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\3DF.OBJ \
+$(OBJDIR)\CLAMP.OBJ \
+$(OBJDIR)\DEQUANT.OBJ \
+$(OBJDIR)\DIFFUSE.OBJ \
+$(OBJDIR)\GLDUTIL.OBJ \
+$(OBJDIR)\MIPMAP.OBJ \
+$(OBJDIR)\NCC.OBJ \
+$(OBJDIR)\NCCNNET.OBJ \
+$(OBJDIR)\PAL256.OBJ \
+$(OBJDIR)\PPM.OBJ \
+$(OBJDIR)\QUANTIZE.OBJ \
+$(OBJDIR)\READ.OBJ \
+$(OBJDIR)\RESAMPLE.OBJ \
+$(OBJDIR)\RGT.OBJ \
+$(OBJDIR)\TEXUSLIB.OBJ \
+$(OBJDIR)\TGA.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIEW.OBJ \
+$(OBJDIR)\WRITE.OBJ
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = texus
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h \
+        ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glide/swlibs/pcilib/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-03-02 13:22:02 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:47 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       swlibs\pcilib makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=pcilib
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\..\sst1\3dfx.mak
+
+
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
 CINCLUDE=-I..\..\sst1\incsrc;..\fxmisc;..\..\sst1\init\initvg;..\..\sst1\glide;..\..\sst1\texus;..\..\sst1\init;$(PDWIN32_INCLUDE)
@@ -21 +30 @@
 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS = fxos2.obj fxpci.obj sst1_pci.obj fxinfo.obj
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\fxos2.obj \
+$(OBJDIR)\fxpci.obj \
+$(OBJDIR)\sst1_pci.obj \
+$(OBJDIR)\fxinfo.obj
 
-$(TARGET).lib: $(OBJS)
-        $(RM) $(TARGET).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = pcilib
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h 
+        ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h \
+        ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 

trunk/src/opengl/glu/makefile

@@ -1 @@
-# $Id: makefile,v 1.11 2000-03-04 19:49:55 bird Exp $
+# $Id: makefile,v 1.12 2000-03-06 23:33:48 bird Exp $
 
 #
-# PD-Win32
+# Odin32 API
 #
 # Top-level makefile for glu32
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\lib
+PDWIN32_BIN     = ..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\tools\bin
 
+# Have extra clean rule.
+CLEAN2 = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
 
-TARGET = GLU32
+# Flag overloads and local macros.
+CLEANEXTRAS = glu32rsrc.asm
 
-all: $(TARGET).DLL $(TARGET).LIB
-
-SOURCES = \
-  nurbs\interface\bezierEval.cpp \
-  nurbs\interface\bezierPatch.cpp \
-  nurbs\interface\bezierPatchMesh.cpp \
-  nurbs\interface\glcurveval.cpp \
-  nurbs\interface\glinterface.cpp \
-  nurbs\interface\glrenderer.cpp \
-  nurbs\interface\glsurfeval.cpp \
-  nurbs\interface\incurveeval.cpp \
-  nurbs\interface\insurfeval.cpp \
-  nurbs\interface\bezierEval.h \
-  nurbs\interface\bezierPatch.h \
-  nurbs\interface\bezierPatchMesh.h \
-  nurbs\interface\glcurveval.h \
-  nurbs\interface\glimports.h \
-  nurbs\interface\glrenderer.h \
-  nurbs\interface\glsurfeval.h \
-  nurbs\interface\mystdio.h \
-  nurbs\interface\mystdlib.h \
-  nurbs\internals\arc.cpp \
-  nurbs\internals\arcsorter.cpp \
-  nurbs\internals\arctess.cpp \
-  nurbs\internals\backend.cpp \
-  nurbs\internals\basiccrveval.cpp \
-  nurbs\internals\basicsurfeval.cpp \
-  nurbs\internals\bin.cpp \
-  nurbs\internals\bufpool.cpp \
-  nurbs\internals\cachingeval.cpp \
-  nurbs\internals\ccw.cpp \
-  nurbs\internals\coveandtiler.cpp \
-  nurbs\internals\curve.cpp \
-  nurbs\internals\curvelist.cpp \
-  nurbs\internals\curvesub.cpp \
-  nurbs\internals\dataTransform.cpp \
-  nurbs\internals\displaylist.cpp \
-  nurbs\internals\flist.cpp \
-  nurbs\internals\flistsorter.cpp \
-  nurbs\internals\hull.cpp \
-  nurbs\internals\intersect.cpp \
-  nurbs\internals\knotvector.cpp \
-  nurbs\internals\mapdesc.cpp \
-  nurbs\internals\mapdescv.cpp \
-  nurbs\internals\maplist.cpp \
-  nurbs\internals\mesher.cpp \
-  nurbs\internals\monotonizer.cpp \
-  nurbs\internals\monoTriangulationBackend.cpp \
-  nurbs\internals\mycode.cpp \
-  nurbs\internals\nurbsinterfac.cpp \
-  nurbs\internals\nurbstess.cpp \
-  nurbs\internals\patch.cpp \
-  nurbs\internals\patchlist.cpp \
-  nurbs\internals\quilt.cpp \
-  nurbs\internals\reader.cpp \
-  nurbs\internals\renderhints.cpp \
-  nurbs\internals\slicer.cpp \
-  nurbs\internals\sorter.cpp \
-  nurbs\internals\splitarcs.cpp \
-  nurbs\internals\subdivider.cpp \
-  nurbs\internals\tobezier.cpp \
-  nurbs\internals\trimline.cpp \
-  nurbs\internals\trimregion.cpp \
-  nurbs\internals\trimvertpool.cpp \
-  nurbs\internals\uarray.cpp \
-  nurbs\internals\varray.cpp \
-  nurbs\internals\arc.h \
-  nurbs\internals\arcsorter.h \
-  nurbs\internals\arctess.h \
-  nurbs\internals\backend.h \
-  nurbs\internals\basiccrveval.h \
-  nurbs\internals\basicsurfeval.h \
-  nurbs\internals\bezierarc.h \
-  nurbs\internals\bin.h \
-  nurbs\internals\bufpool.h \
-  nurbs\internals\cachingeval.h \
-  nurbs\internals\coveandtiler.h \
-  nurbs\internals\curve.h \
-  nurbs\internals\curvelist.h \
-  nurbs\internals\dataTransform.h \
-  nurbs\internals\defines.h \
-  nurbs\internals\displaylist.h \
-  nurbs\internals\displaymode.h \
-  nurbs\internals\flist.h \
-  nurbs\internals\flistsorter.h \
-  nurbs\internals\gridline.h \
-  nurbs\internals\gridtrimvertex.h \
-  nurbs\internals\gridvertex.h \
-  nurbs\internals\hull.h \
-  nurbs\internals\jarcloc.h \
-  nurbs\internals\knotvector.h \
-  nurbs\internals\mapdesc.h \
-  nurbs\internals\maplist.h \
-  nurbs\internals\mesher.h \
-  nurbs\internals\myassert.h \
-  nurbs\internals\mymath.h \
-  nurbs\internals\mysetjmp.h \
-  nurbs\internals\mystring.h \
-  nurbs\internals\nurbsconsts.h \
-  nurbs\internals\nurbstess.h \
-  nurbs\internals\patch.h \
-  nurbs\internals\patchlist.h \
-  nurbs\internals\pwlarc.h \
-  nurbs\internals\quilt.h \
-  nurbs\internals\reader.h \
-  nurbs\internals\renderhints.h \
-  nurbs\internals\simplemath.h \
-  nurbs\internals\slicer.h \
-  nurbs\internals\sorter.h \
-  nurbs\internals\subdivider.h \
-  nurbs\internals\trimline.h \
-  nurbs\internals\trimregion.h \
-  nurbs\internals\trimvertex.h \
-  nurbs\internals\trimvertpool.h \
-  nurbs\internals\types.h \
-  nurbs\internals\uarray.h \
-  nurbs\internals\varray.h \
-  nurbs\nurbtess\directedLine.cpp \
-  nurbs\nurbtess\gridWrap.cpp \
-  nurbs\nurbtess\monoChain.cpp \
-  nurbs\nurbtess\monoPolyPart.cpp \
-  nurbs\nurbtess\monoTriangulation.cpp \
-  nurbs\nurbtess\partitionX.cpp \
-  nurbs\nurbtess\partitionY.cpp \
-  nurbs\nurbtess\polyDBG.cpp \
-  nurbs\nurbtess\polyUtil.cpp \
-  nurbs\nurbtess\primitiveStream.cpp \
-  nurbs\nurbtess\quicksort.cpp \
-  nurbs\nurbtess\rectBlock.cpp \
-  nurbs\nurbtess\sampleComp.cpp \
-  nurbs\nurbtess\sampleCompBot.cpp \
-  nurbs\nurbtess\sampleCompRight.cpp \
-  nurbs\nurbtess\sampleCompTop.cpp \
-  nurbs\nurbtess\sampledLine.cpp \
-  nurbs\nurbtess\sampleMonoPoly.cpp \
-  nurbs\nurbtess\searchTree.cpp \
-  nurbs\nurbtess\definitions.h \
-  nurbs\nurbtess\directedLine.h \
-  nurbs\nurbtess\glimports.h \
-  nurbs\nurbtess\gridWrap.h \
-  nurbs\nurbtess\monoChain.h \
-  nurbs\nurbtess\monoPolyPart.h \
-  nurbs\nurbtess\monoTriangulation.h \
-  nurbs\nurbtess\mystdio.h \
-  nurbs\nurbtess\mystdlib.h \
-  nurbs\nurbtess\partitionX.h \
-  nurbs\nurbtess\partitionY.h \
-  nurbs\nurbtess\polyDBG.h \
-  nurbs\nurbtess\polyUtil.h \
-  nurbs\nurbtess\primitiveStream.h \
-  nurbs\nurbtess\quicksort.h \
-  nurbs\nurbtess\rectBlock.h \
-  nurbs\nurbtess\sampleComp.h \
-  nurbs\nurbtess\sampleCompBot.h \
-  nurbs\nurbtess\sampleCompRight.h \
-  nurbs\nurbtess\sampleCompTop.h \
-  nurbs\nurbtess\sampledLine.h \
-  nurbs\nurbtess\sampleMonoPoly.h \
-  nurbs\nurbtess\searchTree.h \
-  nurbs\nurbtess\zlassert.h \
-  tess\dict.c \
-  tess\geom.c \
-  tess\memalloc.c \
-  tess\mesh.c \
-  tess\normal.c \
-  tess\priorityq.c \
-  tess\render.c \
-  tess\sweep.c \
-  tess\tess.c \
-  tess\tessmono.c \
-  tess\dict-list.h \
-  tess\dict.h \
-  tess\geom.h \
-  tess\memalloc.h \
-  tess\mesh.h \
-  tess\normal.h \
-  tess\priorityq-heap.h \
-  tess\priorityq-sort.h \
-  tess\priorityq.h \
-  tess\render.h \
-  tess\sweep.h \
-  tess\tess.h \
-  tess\tessmono.h \
-  util\glue.c \
-  util\error.c \
-  util\mipmap.c \
-  util\project.c \
-  util\quad.c \
-  util\registry.c \
-  util\gluint.h
-
-OBJS = \
-  initterm.obj \
-  resource.obj \
-  nurbs\interface\bezierEval.obj \
-  nurbs\interface\bezierPatch.obj \
-  nurbs\interface\bezierPatchMesh.obj \
-  nurbs\interface\glcurveval.obj \
-  nurbs\interface\glinterface.obj \
-  nurbs\interface\glrenderer.obj \
-  nurbs\interface\glsurfeval.obj \
-  nurbs\interface\incurveeval.obj \
-  nurbs\interface\insurfeval.obj \
-  nurbs\internals\arc.obj \
-  nurbs\internals\arcsorter.obj \
-  nurbs\internals\arctess.obj \
-  nurbs\internals\backend.obj \
-  nurbs\internals\basiccrveval.obj \
-  nurbs\internals\basicsurfeval.obj \
-  nurbs\internals\bin.obj \
-  nurbs\internals\bufpool.obj \
-  nurbs\internals\cachingeval.obj \
-  nurbs\internals\ccw.obj \
-  nurbs\internals\coveandtiler.obj \
-  nurbs\internals\curve.obj \
-  nurbs\internals\curvelist.obj \
-  nurbs\internals\curvesub.obj \
-  nurbs\internals\dataTransform.obj \
-  nurbs\internals\displaylist.obj \
-  nurbs\internals\flist.obj \
-  nurbs\internals\flistsorter.obj \
-  nurbs\internals\hull.obj \
-  nurbs\internals\intersect.obj \
-  nurbs\internals\knotvector.obj \
-  nurbs\internals\mapdesc.obj \
-  nurbs\internals\mapdescv.obj \
-  nurbs\internals\maplist.obj \
-  nurbs\internals\mesher.obj \
-  nurbs\internals\monotonizer.obj \
-  nurbs\internals\monoTriangulationBackend.obj \
-  nurbs\internals\mycode.obj \
-  nurbs\internals\nurbsinterfac.obj \
-  nurbs\internals\nurbstess.obj \
-  nurbs\internals\patch.obj \
-  nurbs\internals\patchlist.obj \
-  nurbs\internals\quilt.obj \
-  nurbs\internals\reader.obj \
-  nurbs\internals\renderhints.obj \
-  nurbs\internals\slicer.obj \
-  nurbs\internals\sorter.obj \
-  nurbs\internals\splitarcs.obj \
-  nurbs\internals\subdivider.obj \
-  nurbs\internals\tobezier.obj \
-  nurbs\internals\trimline.obj \
-  nurbs\internals\trimregion.obj \
-  nurbs\internals\trimvertpool.obj \
-  nurbs\internals\uarray.obj \
-  nurbs\internals\varray.obj \
-  nurbs\nurbtess\directedLine.obj \
-  nurbs\nurbtess\gridWrap.obj \
-  nurbs\nurbtess\monoChain.obj \
-  nurbs\nurbtess\monoPolyPart.obj \
-  nurbs\nurbtess\monoTriangulation.obj \
-  nurbs\nurbtess\partitionX.obj \
-  nurbs\nurbtess\partitionY.obj \
-  nurbs\nurbtess\polyDBG.obj \
-  nurbs\nurbtess\polyUtil.obj \
-  nurbs\nurbtess\primitiveStream.obj \
-  nurbs\nurbtess\quicksort.obj \
-  nurbs\nurbtess\rectBlock.obj \
-  nurbs\nurbtess\sampleComp.obj \
-  nurbs\nurbtess\sampleCompBot.obj \
-  nurbs\nurbtess\sampleCompRight.obj \
-  nurbs\nurbtess\sampleCompTop.obj \
-  nurbs\nurbtess\sampledLine.obj \
-  nurbs\nurbtess\sampleMonoPoly.obj \
-  nurbs\nurbtess\searchTree.obj \
-  tess\dict.obj \
-  tess\geom.obj \
-  tess\memalloc.obj \
-  tess\mesh.obj \
-  tess\normal.obj \
-  tess\priorityq.obj \
-  tess\render.obj \
-  tess\sweep.obj \
-  tess\tess.obj \
-  tess\tessmono.obj \
-  util\glue.obj \
-  util\error.obj \
-  util\mipmap.obj \
-  util\project.obj \
-  util\quad.obj \
-  util\registry.obj
+CFLAGS      = $(CFLAGS) -I..\mesa\GL
+CXXFLAGS    = $(CXXFLAGS) -I..\mesa\GL
 
 
-$(TARGET).DLL: $(SOURCES) initterm.obj resource.obj $(TARGET).lrf $(TARGET).def
-    cd util
-    $(MAKE_CMD)
-    cd ..\tess
-    $(MAKE_CMD)
-    cd ..\nurbs
-    $(MAKE_CMD)
-    cd ..
-    $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\glu32rsrc.obj
 
 
-$(TARGET).lrf: makefile
-    @echo Creating file <<$(@B).lrf
+# Target name - name of the library without extention and path.
+TARGET = glu32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
+    cd util
+    $(MAKE_CMD) $@
+    cd ..\tess
+    $(MAKE_CMD) $@
+    cd ..\nurbs
+    $(MAKE_CMD) $@
+    cd ..
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
-/OUT:$(TARGET).DLL
+nurbs\interface\$(OBJDIR)\interface.lib
+nurbs\internals\$(OBJDIR)\internals.lib
+nurbs\nurbtess\$(OBJDIR)\nurbtess.lib
+tess\$(OBJDIR)\tess.lib
+util\$(OBJDIR)\util.lib
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(PDWIN32_LIB)\KERNEL32.LIB
@@ -329 +86 @@
 
 
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
-
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
     *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd util
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..\tess
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..\nurbs
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-
-clean:
-    $(RM) *.obj *.dll *.lib *.lrf *exp.def resource.asm \
-      $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
+# Extra Clean.
+clean2:
     cd util
     $(MAKE_CMD) clean
@@ -368 +109 @@
     cd ..
 
+
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+

trunk/src/opengl/glu/nurbs/interface/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 2000-03-01 14:50:16 sandervl Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:49 bird Exp $
 #
 # PD-Win32 API
@@ -6 +6 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess -I$(PDWIN32_INCLUDE) -I..\..\include  -I..\..\..\mesa
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS = glcurveval.obj glinterface.obj glrenderer.obj glsurfeval.obj \
-       insurfeval.obj bezierPatch.obj bezierEval.obj bezierPatchMesh.obj \
-       incurveeval.obj
+CINCLUDE    = -I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess \
+              -I..\..\include  -I..\..\..\mesa
 
-all: $(OBJS)
+CFLAGS      = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\glcurveval.obj \
+$(OBJDIR)\glinterface.obj \
+$(OBJDIR)\glrenderer.obj \
+$(OBJDIR)\glsurfeval.obj \
+$(OBJDIR)\insurfeval.obj \
+$(OBJDIR)\bezierPatch.obj \
+$(OBJDIR)\bezierEval.obj \
+$(OBJDIR)\bezierPatchMesh.obj \
+$(OBJDIR)\incurveeval.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = interface
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
         ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-

trunk/src/opengl/glu/nurbs/internals/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs/internals makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include -I$(PDWIN32_INCLUDE)
-CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS = arc.obj arcsorter.obj arctess.obj backend.obj basiccrveval.obj \
-       basicsurfeval.obj bin.obj bufpool.obj cachingeval.obj ccw.obj \
-       coveandtiler.obj curve.obj curvelist.obj curvesub.obj displaylist.obj \
-       flist.obj flistsorter.obj hull.obj intersect.obj knotvector.obj \
-       mapdesc.obj mapdescv.obj maplist.obj mesher.obj monotonizer.obj \
-       mycode.obj nurbsinterfac.obj nurbstess.obj patch.obj patchlist.obj \
-       quilt.obj reader.obj renderhints.obj slicer.obj sorter.obj \
-       splitarcs.obj subdivider.obj tobezier.obj trimline.obj trimregion.obj \
-       trimvertpool.obj uarray.obj varray.obj dataTransform.obj \
-       monoTriangulationBackend.obj
+CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
+CDEFS       = -DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
-all: $(OBJS)
+CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\arc.obj \
+$(OBJDIR)\arcsorter.obj \
+$(OBJDIR)\arctess.obj \
+$(OBJDIR)\backend.obj \
+$(OBJDIR)\basiccrveval.obj \
+$(OBJDIR)\basicsurfeval.obj \
+$(OBJDIR)\bin.obj \
+$(OBJDIR)\bufpool.obj \
+$(OBJDIR)\cachingeval.obj \
+$(OBJDIR)\ccw.obj \
+$(OBJDIR)\coveandtiler.obj \
+$(OBJDIR)\curve.obj \
+$(OBJDIR)\curvelist.obj \
+$(OBJDIR)\curvesub.obj \
+$(OBJDIR)\displaylist.obj \
+$(OBJDIR)\flist.obj \
+$(OBJDIR)\flistsorter.obj \
+$(OBJDIR)\hull.obj \
+$(OBJDIR)\intersect.obj \
+$(OBJDIR)\knotvector.obj \
+$(OBJDIR)\mapdesc.obj \
+$(OBJDIR)\mapdescv.obj \
+$(OBJDIR)\maplist.obj \
+$(OBJDIR)\mesher.obj \
+$(OBJDIR)\monotonizer.obj \
+$(OBJDIR)\mycode.obj
+
+OBJS2 = \
+$(OBJDIR)\nurbsinterfac.obj \
+$(OBJDIR)\nurbstess.obj \
+$(OBJDIR)\patch.obj \
+$(OBJDIR)\patchlist.obj \
+$(OBJDIR)\quilt.obj \
+$(OBJDIR)\reader.obj \
+$(OBJDIR)\renderhints.obj \
+$(OBJDIR)\slicer.obj \
+$(OBJDIR)\sorter.obj \
+$(OBJDIR)\splitarcs.obj \
+$(OBJDIR)\subdivider.obj \
+$(OBJDIR)\tobezier.obj \
+$(OBJDIR)\trimline.obj \
+$(OBJDIR)\trimregion.obj \
+$(OBJDIR)\trimvertpool.obj \
+$(OBJDIR)\uarray.obj \
+$(OBJDIR)\varray.obj \
+$(OBJDIR)\dataTransform.obj \
+$(OBJDIR)\monoTriangulationBackend.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = internals
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS) $(OBJS2)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS2);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\nurbtess\*.h ..\..\..\mesa\GL\*.h ..\..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-

trunk/src/opengl/glu/nurbs/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 2000-03-04 19:59:20 bird Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:48 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB     = ..\..\..\..\lib
-PDWIN32_BIN     = ..\..\..\..\bin
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-all:
+# All, libs, dep and clean rule.
+clean dep all libs:
     cd interface
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..\internals
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..\nurbtess
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..
 
-
-dep:
-    cd interface
-    $(MAKE_CMD) dep
-    cd ..\internals
-    $(MAKE_CMD) dep
-    cd ..\nurbtess
-    $(MAKE_CMD) dep
-    cd ..
-
-
-clean:
-    cd interface
-    $(MAKE_CMD) clean
-    cd ..\internals
-    $(MAKE_CMD) clean
-    cd ..\nurbtess
-    $(MAKE_CMD) clean
-    cd ..
-

trunk/src/opengl/glu/nurbs/nurbtess/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs/nurbtess makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I$(PDWIN32_INCLUDE) -I..\..\include
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
-
-OBJS = directedLine.obj gridWrap.obj monoTriangulation.obj partitionY.obj \
-       polyDBG.obj polyUtil.obj primitiveStream.obj quicksort.obj \
-       rectBlock.obj sampleComp.obj sampleCompBot.obj sampleCompRight.obj \
-       sampleCompTop.obj sampleMonoPoly.obj sampledLine.obj searchTree.obj \
-       partitionX.obj monoChain.obj monoPolyPart.obj
-
-all: $(OBJS)
+CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
+CFLAGS      = $(CFLAGS) $(CINCLUDE) -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\directedLine.obj \
+$(OBJDIR)\gridWrap.obj \
+$(OBJDIR)\monoTriangulation.obj \
+$(OBJDIR)\partitionY.obj \
+$(OBJDIR)\polyDBG.obj \
+$(OBJDIR)\polyUtil.obj \
+$(OBJDIR)\primitiveStream.obj \
+$(OBJDIR)\quicksort.obj \
+$(OBJDIR)\rectBlock.obj \
+$(OBJDIR)\sampleComp.obj \
+$(OBJDIR)\sampleCompBot.obj \
+$(OBJDIR)\sampleCompRight.obj \
+$(OBJDIR)\sampleCompTop.obj \
+$(OBJDIR)\sampleMonoPoly.obj \
+$(OBJDIR)\sampledLine.obj \
+$(OBJDIR)\searchTree.obj \
+$(OBJDIR)\partitionX.obj \
+$(OBJDIR)\monoChain.obj \
+$(OBJDIR)\monoPolyPart.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = nurbtess
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\..\mesa\*.h ..\nurbtess\*.h ..\internals\*.h ..\..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-

trunk/src/opengl/glu/tess/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/tess makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
-CDEFS=-DNDEBUG -Tdp
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS= dict.obj memalloc.obj mesh.obj normal.obj priorityq.obj \
-      render.obj sweep.obj tess.obj tessmono.obj geom.obj
-
-all: $(OBJS)
+CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
+CDEFS       = -DNDEBUG -Tdp
+CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
 
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS= \
+$(OBJDIR)\dict.obj \
+$(OBJDIR)\memalloc.obj \
+$(OBJDIR)\mesh.obj \
+$(OBJDIR)\normal.obj \
+$(OBJDIR)\priorityq.obj \
+$(OBJDIR)\render.obj \
+$(OBJDIR)\sweep.obj \
+$(OBJDIR)\tess.obj \
+$(OBJDIR)\tessmono.obj \
+$(OBJDIR)\geom.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = tess
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\..\mesa\*.h ..\*.h ..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj

trunk/src/opengl/glu/util/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/util makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS= error.obj glue.obj mipmap.obj project.obj quad.obj registry.obj
-
-all: $(OBJS)
+CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
+CFLAGS      = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\error.obj \
+$(OBJDIR)\glue.obj \
+$(OBJDIR)\mipmap.obj \
+$(OBJDIR)\project.obj \
+$(OBJDIR)\quad.obj \
+$(OBJDIR)\registry.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = util
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
         ..\include\*.h ..\..\mesa\*.h ..\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.map

trunk/src/opengl/glut/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.10 2000-03-05 10:19:37 jeroen Exp $
+# $Id: Makefile,v 1.11 2000-03-06 23:33:11 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glut32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\lib
+PDWIN32_BIN     = ..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS   = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
-CXXFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
+# Flag overloads and local macros.
+CLEANEXTRAS = 32rsrc.asm
 
-TARGET=GLUT32
-
-all: $(TARGET).DLL $(TARGET).LIB
-
-OBJS = glut_8x13.obj glut_9x15.obj glut_bitmap.obj glut_bwidth.obj glut_cindex.obj \
-       glut_cmap.obj glut_cursor.obj glut_dials.obj glut_dstr.obj glut_event.obj \
-       glut_ext.obj glut_fullscrn.obj glut_gamemode.obj glut_get.obj glut_hel10.obj \
-       glut_hel12.obj glut_hel18.obj glut_init.obj glut_input.obj glut_joy.obj glut_key.obj \
-       glut_keyctrl.obj glut_keyup.obj glut_mesa.obj glut_modifier.obj glut_mroman.obj \
-       glut_overlay.obj glut_roman.obj glut_shapes.obj glut_space.obj glut_stroke.obj \
-       glut_swap.obj glut_swidth.obj glut_tablet.obj glut_teapot.obj glut_tr10.obj \
-       glut_tr24.obj glut_util.obj glut_vidresize.obj glut_warp.obj glut_win.obj \
-       glut_winmisc.obj win32_glx.obj win32_menu.obj win32_util.obj win32_winproc.obj \
-       win32_x11.obj glut_term.obj initterm.obj resource.obj
-
-all: $(TARGET).DLL
-
-$(TARGET).DLL: $(OBJS) $(TARGET).def $(TARGET).lrf
-    $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)
+CFLAGS      = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I..\mesa
+CXXFLAGS    = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I..\mesa
 
 
-$(TARGET).lrf: makefile
-    @echo Creating file <<$(@B).lrf
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\glut_8x13.obj \
+$(OBJDIR)\glut_9x15.obj \
+$(OBJDIR)\glut_bitmap.obj \
+$(OBJDIR)\glut_bwidth.obj \
+$(OBJDIR)\glut_cindex.obj \
+$(OBJDIR)\glut_cmap.obj \
+$(OBJDIR)\glut_cursor.obj \
+$(OBJDIR)\glut_dials.obj \
+$(OBJDIR)\glut_dstr.obj \
+$(OBJDIR)\glut_event.obj \
+$(OBJDIR)\glut_ext.obj \
+$(OBJDIR)\glut_fullscrn.obj \
+$(OBJDIR)\glut_gamemode.obj \
+$(OBJDIR)\glut_get.obj \
+$(OBJDIR)\glut_hel10.obj \
+$(OBJDIR)\glut_hel12.obj \
+$(OBJDIR)\glut_hel18.obj \
+$(OBJDIR)\glut_init.obj \
+$(OBJDIR)\glut_input.obj \
+$(OBJDIR)\glut_joy.obj \
+$(OBJDIR)\glut_key.obj \
+$(OBJDIR)\glut_keyctrl.obj \
+$(OBJDIR)\glut_keyup.obj \
+$(OBJDIR)\glut_mesa.obj \
+$(OBJDIR)\glut_modifier.obj \
+$(OBJDIR)\glut_mroman.obj \
+$(OBJDIR)\glut_overlay.obj \
+$(OBJDIR)\glut_roman.obj \
+$(OBJDIR)\glut_shapes.obj \
+$(OBJDIR)\glut_space.obj \
+$(OBJDIR)\glut_stroke.obj \
+$(OBJDIR)\glut_swap.obj \
+$(OBJDIR)\glut_swidth.obj \
+$(OBJDIR)\glut_tablet.obj \
+$(OBJDIR)\glut_teapot.obj \
+$(OBJDIR)\glut_tr10.obj \
+$(OBJDIR)\glut_tr24.obj \
+$(OBJDIR)\glut_util.obj \
+$(OBJDIR)\glut_vidresize.obj \
+$(OBJDIR)\glut_warp.obj \
+$(OBJDIR)\glut_win.obj \
+$(OBJDIR)\glut_winmisc.obj \
+$(OBJDIR)\win32_glx.obj \
+$(OBJDIR)\win32_menu.obj \
+$(OBJDIR)\win32_util.obj \
+$(OBJDIR)\win32_winproc.obj \
+$(OBJDIR)\win32_x11.obj \
+$(OBJDIR)\glut_term.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\glut32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
+TARGET  = glut32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
 $(OBJS)
-/OUT:$(TARGET).DLL /DLL
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(RTLLIB_O)
@@ -58 +116 @@
 
 
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
         *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.lrf *exp.def resource.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib

trunk/src/opengl/makefile

@@ -1 @@
-# $Id: makefile,v 1.16 2000-03-04 20:18:05 bird Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:33:42 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       opengl32.dll makefile
 #
 
+# Directories
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+
+# Common tools macros. (MAKE_CMD)
+!include $(PDWIN32_INCLUDE)\pdwin32.mk
 
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+# dummy all rule - invoking nmake withtout target caused it to do all of the targets below..
+_all: all
 
 
-#SvL: Only build the release version of glide, mesa & glu(t)
-#     There's no need for debug (even without dbg info) builds in the daily build archive
-# MAKE_CMD=nmake
-#KSO: Don't work as we use to have DEBUG defined as an enviroment variable.
-#     I have updated the opengl makefiles to consider NODEBUGINFO. If you don't wan't
-#     any debuginfo you could now add NODEBUGINFO=1 to MAKE_CMD.
-
-CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
-
-#TARGET1  = opengl32
-#DTARGET1 = opengl32
-TARGET2  = glu\glu32
-DTARGET2 = glu32
-TARGET3  = glut\glut32
-DTARGET3 = glut32
-TARGET4  = glide
-DTARGET4 = glide2x
-TARGET5  = mesa
-DTARGET5 = opengl32
-TARGET6  = 3dfxmesa
-
-#OBJS1=  opengl32.obj initterm.obj resource.obj
-
-#all: $(TARGET1).dll $(TARGET1).lib \
-all: $(TARGET5) $(TARGET2).dll $(TARGET2).lib \
-     $(TARGET3).dll $(TARGET3).lib $(TARGET4) $(TARGET6)
-
-#$(TARGET1).dll: $(OBJS1) $(TARGET1).def
-#    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS1) $(TARGET1).def \
-#          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib \
-#          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-#          OS2386.LIB $(RTLLIB_O)
-#    $(CP) $@ $(PDWIN32_BIN)
-
-
-#$(TARGET1).lib: $(TARGET1)exp.def
-#    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET1)exp.def
-#    $(CP) $@ $(PDWIN32_LIB)
-
-#$(TARGET1)exp.def: $(TARGET1).def
-#    $(IMPDEF) $** $@
-
-
-#resource.asm: $(TARGET1).rc
-#    $(RC) $(RCFLAGS) -o resource.asm $(TARGET1).rc
-
-
-$(TARGET2).dll:
-    cd glu
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET3).dll:
-    cd glut
-    $(MAKE_CMD)
-    cd ..
-
-
-$(TARGET2).lib:
-    cd glu
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-
-$(TARGET3).lib:
-    cd glut
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-
-$(TARGET4):
-    cd glide
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET5):
+# All, Lib, Clean and Dep rules.
+clean dep all lib:
     cd mesa
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET6):
-    cd mesa\3dfx
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\glu
+    $(MAKE_CMD) $@
+    cd ..\glut
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\mesa\3dfx
+    $(MAKE_CMD) $@
     cd ..\..
 
-#lib: $(TARGET1).lib $(PDWIN32_LIB)\$(DTARGET1).lib \
-lib: $(TARGET2).lib $(PDWIN32_LIB)\$(DTARGET2).lib \
-     $(TARGET3).lib $(PDWIN32_LIB)\$(DTARGET3).lib \
-     $(PDWIN32_LIB)\$(DTARGET4).lib \
-     $(PDWIN32_LIB)\$(DTARGET5).lib
-
-#$(PDWIN32_LIB)\$(DTARGET1).lib: $(TARGET1).lib
-#    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET2).lib: $(TARGET2).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET3).lib: $(TARGET3).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET4).lib:
-    cd glide
-    $(MAKE_CMD) lib
-    cd ..
-
-$(PDWIN32_LIB)\$(DTARGET5).lib:
-    cd mesa
-    $(MAKE_CMD) lib
-    cd ..
-
-dep:
-    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
-        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
-    cd glut
-    $(MAKE_CMD) dep
-    cd ..\glu
-    $(MAKE_CMD) dep
-    cd ..\glide
-    $(MAKE_CMD) dep
-    cd ..\mesa
-    $(MAKE_CMD) dep
-    cd 3dfx
-    $(MAKE_CMD) dep
-    cd ..\..
-
-!ifndef NODEP
-!include .depend
-!endif
-
-
-clean:
-    $(RM) *.obj *.lib *.dll *.map resource.asm *exp.def
-    cd glut
-    $(MAKE_CMD) clean
-    cd ..\glu
-    $(MAKE_CMD) clean
-    cd ..\glide
-    $(MAKE_CMD) clean
-    cd ..\mesa
-    $(MAKE_CMD) clean
-    cd 3dfx
-    $(MAKE_CMD) clean
-    cd ..\..
-

trunk/src/opengl/mesa/3dfx/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 2000-03-04 19:41:39 bird Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:51 bird Exp $
 #
 # PD-Win32
@@ -6 +6 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\lib
@@ -11 +12 @@
 PDWIN32_TOOLS = ..\..\..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
-
 MESADEFS= -DNO_PARALLEL -DNO_STEREO -DGL_MESA_window_pos -DTHREADS \
           -DUSE_X86_ASM_NOT -DUSE_MMX_ASM_NOT -DUSE_3DNOW_ASM_NOT \
           -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32
 
-CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
-CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
+CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
+CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
 
-TARGET = OPENGL32
 
-all: $(TARGET).DLL
+#
+# Interference rule for sources in the parent directory.
+#
+{..}.c{$(OBJDIR)}.obj:
+    $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
 
-OBJS =  fxapi.obj \
-    fxcva.obj \
-    fxclip.obj \
-    fxdd.obj \
-    fxddspan.obj \
-    fxddtex.obj \
-    fxglidew.obj \
-    fxfastpath.obj \
-    fxpipeline.obj \
-    fxrender.obj \
-    fxsanity.obj \
-    fxsetup.obj \
-    fxtexman.obj \
-    fxtrifuncs.obj \
-    fxvsetup.obj \
-    fxwgl.obj initterm.obj resource.obj \
-    accum.obj alpha.obj alphabuf.obj api1.obj api2.obj apiext.obj \
-    attrib.obj bbox.obj bitmap.obj blend.obj clip.obj colortab.obj config.obj context.obj \
-    copypix.obj cva.obj depth.obj dlist.obj drawpix.obj enable.obj enums.obj eval.obj \
-    extensions.obj feedback.obj fog.obj get.obj glmisc.obj hash.obj image.obj light.obj \
-    lines.obj logic.obj masking.obj matrix.obj mmath.obj mthreads.obj pb.obj pipeline.obj \
-    pixel.obj pointers.obj points.obj polygon.obj quads.obj rastpos.obj readpix.obj \
-    rect.obj scissor.obj shade.obj span.obj stages.obj stencil.obj teximage.obj texobj.obj texstate.obj \
-    texture.obj translate.obj triangle.obj varray.obj vb.obj vbcull.obj vbfill.obj \
-    vbindirect.obj vbrender.obj vbxform.obj vector.obj vertices.obj winpos.obj xform.obj zoom.obj \
-    osmesa.obj
 
-$(TARGET).DLL: $(OBJS) $(TARGET).lrf $(TARGET).def
-    -$(LD2) $(LD2FLAGS) /FREE /NOE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)\Glide
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\fxapi.obj \
+$(OBJDIR)\fxcva.obj \
+$(OBJDIR)\fxclip.obj \
+$(OBJDIR)\fxdd.obj \
+$(OBJDIR)\fxddspan.obj \
+$(OBJDIR)\fxddtex.obj \
+$(OBJDIR)\fxglidew.obj \
+$(OBJDIR)\fxfastpath.obj \
+$(OBJDIR)\fxpipeline.obj \
+$(OBJDIR)\fxrender.obj \
+$(OBJDIR)\fxsanity.obj \
+$(OBJDIR)\fxsetup.obj \
+$(OBJDIR)\fxtexman.obj \
+$(OBJDIR)\fxtrifuncs.obj \
+$(OBJDIR)\fxvsetup.obj \
+$(OBJDIR)\fxwgl.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\fxmesa32.obj \
+$(OBJDIR)\accum.obj \
+$(OBJDIR)\alpha.obj \
+$(OBJDIR)\alphabuf.obj \
+$(OBJDIR)\api1.obj \
+$(OBJDIR)\api2.obj \
+$(OBJDIR)\apiext.obj \
+$(OBJDIR)\attrib.obj \
+$(OBJDIR)\bbox.obj \
+$(OBJDIR)\bitmap.obj \
+$(OBJDIR)\blend.obj \
+$(OBJDIR)\clip.obj \
+$(OBJDIR)\colortab.obj \
+$(OBJDIR)\config.obj \
+$(OBJDIR)\context.obj \
+$(OBJDIR)\copypix.obj \
+$(OBJDIR)\cva.obj \
+$(OBJDIR)\depth.obj \
+$(OBJDIR)\dlist.obj \
+$(OBJDIR)\drawpix.obj \
+$(OBJDIR)\enable.obj \
+$(OBJDIR)\enums.obj \
+$(OBJDIR)\eval.obj \
+$(OBJDIR)\extensions.obj \
+$(OBJDIR)\feedback.obj \
+$(OBJDIR)\fog.obj \
+$(OBJDIR)\get.obj \
+$(OBJDIR)\glmisc.obj \
+$(OBJDIR)\hash.obj \
+$(OBJDIR)\image.obj \
+$(OBJDIR)\light.obj \
+$(OBJDIR)\lines.obj \
+$(OBJDIR)\logic.obj \
+$(OBJDIR)\masking.obj \
+$(OBJDIR)\matrix.obj \
+$(OBJDIR)\mmath.obj \
+$(OBJDIR)\mthreads.obj \
+$(OBJDIR)\pb.obj \
+$(OBJDIR)\pipeline.obj \
+$(OBJDIR)\pixel.obj \
+$(OBJDIR)\pointers.obj \
+$(OBJDIR)\points.obj \
+$(OBJDIR)\polygon.obj \
+$(OBJDIR)\quads.obj \
+$(OBJDIR)\rastpos.obj \
+$(OBJDIR)\readpix.obj \
+$(OBJDIR)\rect.obj \
+$(OBJDIR)\scissor.obj \
+$(OBJDIR)\shade.obj \
+$(OBJDIR)\span.obj \
+$(OBJDIR)\stages.obj \
+$(OBJDIR)\stencil.obj \
+$(OBJDIR)\teximage.obj \
+$(OBJDIR)\texobj.obj \
+$(OBJDIR)\texstate.obj \
+$(OBJDIR)\texture.obj \
+$(OBJDIR)\translate.obj \
+$(OBJDIR)\triangle.obj \
+$(OBJDIR)\varray.obj \
+$(OBJDIR)\vb.obj \
+$(OBJDIR)\vbcull.obj \
+$(OBJDIR)\vbfill.obj \
+$(OBJDIR)\vbindirect.obj \
+$(OBJDIR)\vbrender.obj \
+$(OBJDIR)\vbxform.obj \
+$(OBJDIR)\vector.obj \
+$(OBJDIR)\vertices.obj \
+$(OBJDIR)\winpos.obj \
+$(OBJDIR)\xform.obj \
+$(OBJDIR)\zoom.obj \
+$(OBJDIR)\osmesa.obj
 
-$(TARGET).lrf: makefile
-  @echo Creating file <<$(@B).lrf
+
+# Target name - name of the dll without extention and path.
+TARGET = opengl32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
-/OUT:$(TARGET).DLL
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(PDWIN32_LIB)\KERNEL32.LIB
@@ -69 +158 @@
 <<keep
 
-resource.asm: fxmesa32.rc
-    $(RC) $(RCFLAGS) -o resource.asm fxmesa32.rc
 
-#
-# Tried to create a general interference rule for these?
-# As long as there isn't any .c, .cpp or .asm files with matching
-# names in the current directory thise shouldn't be any problem.
-# For example:
-#   {..}.c.obj:
-#       $(CC) $(CFLAGS) -c $<
-#
-# Regards knut.
-#
-
-accum.obj: ..\accum.c
-    $(CC) $(CFLAGS) -c ..\accum.c
-
-alpha.obj: ..\alpha.c
-    $(CC) $(CFLAGS) -c ..\alpha.c
-alphabuf.obj: ..\alphabuf.c
-    $(CC) $(CFLAGS) -c ..\alphabuf.c
-api1.obj: ..\api1.c
-    $(CC) $(CFLAGS) -c ..\api1.c
-api2.obj: ..\api2.c
-    $(CC) $(CFLAGS) -c ..\api2.c
-apiext.obj: ..\apiext.c
-    $(CC) $(CFLAGS) -c ..\apiext.c
-attrib.obj: ..\attrib.c
-    $(CC) $(CFLAGS) -c ..\attrib.c
-bbox.obj: ..\bbox.c
-    $(CC) $(CFLAGS) -c ..\bbox.c
-bitmap.obj: ..\bitmap.c
-    $(CC) $(CFLAGS) -c ..\bitmap.c
-blend.obj: ..\blend.c
-    $(CC) $(CFLAGS) -c ..\blend.c
-clip.obj: ..\clip.c
-    $(CC) $(CFLAGS) -c ..\clip.c
-colortab.obj: ..\colortab.c
-    $(CC) $(CFLAGS) -c ..\colortab.c
-config.obj: ..\config.c
-    $(CC) $(CFLAGS) -c ..\config.c
-context.obj: ..\context.c
-    $(CC) $(CFLAGS) -c ..\context.c
-copypix.obj: ..\copypix.c
-    $(CC) $(CFLAGS) -c ..\copypix.c
-cva.obj: ..\cva.c
-    $(CC) $(CFLAGS) -c ..\cva.c
-depth.obj: ..\depth.c
-    $(CC) $(CFLAGS) -c ..\depth.c
-dlist.obj: ..\dlist.c
-    $(CC) $(CFLAGS) -c ..\dlist.c
-drawpix.obj: ..\drawpix.c
-    $(CC) $(CFLAGS) -c ..\drawpix.c
-enable.obj: ..\enable.c
-    $(CC) $(CFLAGS) -c ..\enable.c
-enums.obj: ..\enums.c
-    $(CC) $(CFLAGS) -c ..\enums.c
-eval.obj: ..\eval.c
-    $(CC) $(CFLAGS) -c ..\eval.c
-extensions.obj: ..\extensions.c
-    $(CC) $(CFLAGS) -c ..\extensions.c
-feedback.obj: ..\feedback.c
-    $(CC) $(CFLAGS) -c ..\feedback.c
-fog.obj: ..\fog.c
-    $(CC) $(CFLAGS) -c ..\fog.c
-get.obj: ..\get.c
-    $(CC) $(CFLAGS) -c ..\get.c
-glmisc.obj: ..\glmisc.c
-    $(CC) $(CFLAGS) -c ..\glmisc.c
-hash.obj: ..\hash.c
-    $(CC) $(CFLAGS) -c ..\hash.c
-image.obj: ..\image.c
-    $(CC) $(CFLAGS) -c ..\image.c
-light.obj: ..\light.c
-    $(CC) $(CFLAGS) -c ..\light.c
-lines.obj: ..\lines.c
-    $(CC) $(CFLAGS) -c ..\lines.c
-logic.obj: ..\logic.c
-    $(CC) $(CFLAGS) -c ..\logic.c
-masking.obj: ..\masking.c
-    $(CC) $(CFLAGS) -c ..\masking.c
-matrix.obj: ..\matrix.c
-    $(CC) $(CFLAGS) -c ..\matrix.c
-mmath.obj: ..\mmath.c
-    $(CC) $(CFLAGS) -c ..\mmath.c
-mthreads.obj: ..\mthreads.c
-    $(CC) $(CFLAGS) -c ..\mthreads.c
-pb.obj: ..\pb.c
-    $(CC) $(CFLAGS) -c ..\pb.c
-pipeline.obj: ..\pipeline.c
-    $(CC) $(CFLAGS) -c ..\pipeline.c
-pixel.obj: ..\pixel.c
-    $(CC) $(CFLAGS) -c ..\pixel.c
-pointers.obj: ..\pointers.c
-    $(CC) $(CFLAGS) -c ..\pointers.c
-points.obj: ..\points.c
-    $(CC) $(CFLAGS) -c ..\points.c
-polygon.obj: ..\polygon.c
-    $(CC) $(CFLAGS) -c ..\polygon.c
-quads.obj: ..\quads.c
-    $(CC) $(CFLAGS) -c ..\quads.c
-rastpos.obj: ..\rastpos.c
-    $(CC) $(CFLAGS) -c ..\rastpos.c
-readpix.obj: ..\readpix.c
-    $(CC) $(CFLAGS) -c ..\readpix.c
-rect.obj: ..\rect.c
-    $(CC) $(CFLAGS) -c ..\rect.c
-scissor.obj: ..\scissor.c
-    $(CC) $(CFLAGS) -c ..\scissor.c
-shade.obj: ..\shade.c
-    $(CC) $(CFLAGS) -c ..\shade.c
-span.obj: ..\span.c
-    $(CC) $(CFLAGS) -c ..\span.c
-stages.obj: ..\stages.c
-    $(CC) $(CFLAGS) -c ..\stages.c
-stencil.obj: ..\stencil.c
-    $(CC) $(CFLAGS) -c ..\stencil.c
-teximage.obj: ..\teximage.c
-    $(CC) $(CFLAGS) -c ..\teximage.c
-texobj.obj: ..\texobj.c
-    $(CC) $(CFLAGS) -c ..\texobj.c
-texstate.obj: ..\texstate.c
-    $(CC) $(CFLAGS) -c ..\texstate.c
-texture.obj: ..\texture.c
-    $(CC) $(CFLAGS) -c ..\texture.c
-translate.obj: ..\translate.c
-    $(CC) $(CFLAGS) -c ..\translate.c
-triangle.obj: ..\triangle.c
-    $(CC) $(CFLAGS) -c ..\triangle.c
-varray.obj: ..\varray.c
-    $(CC) $(CFLAGS) -c ..\varray.c
-vb.obj: ..\vb.c
-    $(CC) $(CFLAGS) -c ..\vb.c
-vbcull.obj: ..\vbcull.c
-    $(CC) $(CFLAGS) -c ..\vbcull.c
-vbfill.obj: ..\vbfill.c
-    $(CC) $(CFLAGS) -c ..\vbfill.c
-vbindirect.obj: ..\vbindirect.c
-    $(CC) $(CFLAGS) -c ..\vbindirect.c
-vbrender.obj: ..\vbrender.c
-    $(CC) $(CFLAGS) -c ..\vbrender.c
-vbxform.obj: ..\vbxform.c
-    $(CC) $(CFLAGS) -c ..\vbxform.c
-vector.obj: ..\vector.c
-    $(CC) $(CFLAGS) -c ..\vector.c
-vertices.obj: ..\vertices.c
-    $(CC) $(CFLAGS) -c ..\vertices.c
-winpos.obj: ..\winpos.c
-    $(CC) $(CFLAGS) -c ..\winpos.c
-xform.obj: ..\xform.c
-    $(CC) $(CFLAGS) -c ..\xform.c
-zoom.obj: ..\zoom.c
-    $(CC) $(CFLAGS) -c ..\zoom.c
-osmesa.obj: ..\osmesa.c
-    $(CC) $(CFLAGS) -c ..\osmesa.c
-wmesa.obj: ..\wmesa.obj
-    $(CC) $(CFLAGS) -c ..\osmesa.obj
-internal.obj: ..\internal.c
-    $(CC) $(CFLAGS) -c ..\internal.c
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\..\glut -I..\GL -I.. -I$(PDWIN32_INCLUDE)\glide \
         *.c *.cpp *.h *.asm *.inc ..\*.c $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.dll *.lib *.lrf resource.asm $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post