remove carriage return chars

1 files changed, 156 insertions, 156 deletions

diff --git a/src/glu/sgi/Makefile.win b/src/glu/sgi/Makefile.win
index 1d239e7dfdf..3d0067ef017 100644
--- a/src/glu/sgi/Makefile.win
+++ b/src/glu/sgi/Makefile.win
@@ -1,156 +1,156 @@
-# Makefile for Win32

-

-#

-# Sept 12, 2001

-# Note: The nurbs code is not being built at this time.

-# If you want to work on it, uncomment the definitions

-# noted below to try to compile the sources.

-# There are numerous problems, some of which may be solved

-# by setting some #defines.

-#

-

-!include <win32.mak>

-

-.SUFFIXES : .cc

-

-TOP = ..

-

-GLU_SRCS_CC = \

-	libnurbs\interface\bezierEval.cc \

-	libnurbs\interface\bezierPatch.cc \

-	libnurbs\interface\bezierPatchMesh.cc \

-	libnurbs\interface\glcurveval.cc \

-	libnurbs\interface\glinterface.cc \

-	libnurbs\interface\glrenderer.cc \

-	libnurbs\interface\glsurfeval.cc \

-	libnurbs\interface\incurveeval.cc \

-	libnurbs\interface\insurfeval.cc \

-	libnurbs\internals\arc.cc \

-	libnurbs\internals\arcsorter.cc \

-	libnurbs\internals\arctess.cc \

-	libnurbs\internals\backend.cc \

-	libnurbs\internals\basiccrveval.cc \

-	libnurbs\internals\basicsurfeval.cc \

-	libnurbs\internals\bin.cc \

-	libnurbs\internals\bufpool.cc \

-	libnurbs\internals\cachingeval.cc \

-	libnurbs\internals\ccw.cc \

-	libnurbs\internals\coveandtiler.cc \

-	libnurbs\internals\curve.cc \

-	libnurbs\internals\curvelist.cc \

-	libnurbs\internals\curvesub.cc \

-	libnurbs\internals\dataTransform.cc \

-	libnurbs\internals\displaylist.cc \

-	libnurbs\internals\flist.cc \

-	libnurbs\internals\flistsorter.cc \

-	libnurbs\internals\hull.cc \

-	libnurbs\internals\intersect.cc \

-	libnurbs\internals\knotvector.cc \

-	libnurbs\internals\mapdesc.cc \

-	libnurbs\internals\mapdescv.cc \

-	libnurbs\internals\maplist.cc \

-	libnurbs\internals\mesher.cc \

-	libnurbs\internals\monoTriangulationBackend.cc \

-	libnurbs\internals\monotonizer.cc \

-	libnurbs\internals\mycode.cc \

-	libnurbs\internals\nurbsinterfac.cc \

-	libnurbs\internals\nurbstess.cc \

-	libnurbs\internals\patch.cc \

-	libnurbs\internals\patchlist.cc \

-	libnurbs\internals\quilt.cc \

-	libnurbs\internals\reader.cc \

-	libnurbs\internals\renderhints.cc \

-	libnurbs\internals\slicer.cc \

-	libnurbs\internals\sorter.cc \

-	libnurbs\internals\splitarcs.cc \

-	libnurbs\internals\subdivider.cc \

-	libnurbs\internals\tobezier.cc \

-	libnurbs\internals\trimline.cc \

-	libnurbs\internals\trimregion.cc \

-	libnurbs\internals\trimvertpool.cc \

-	libnurbs\internals\uarray.cc \

-	libnurbs\internals\varray.cc \

-	libnurbs\nurbtess\directedLine.cc \

-	libnurbs\nurbtess\gridWrap.cc \

-	libnurbs\nurbtess\monoChain.cc \

-	libnurbs\nurbtess\monoPolyPart.cc \

-	libnurbs\nurbtess\monoTriangulation.cc \

-	libnurbs\nurbtess\partitionX.cc \

-	libnurbs\nurbtess\partitionY.cc \

-	libnurbs\nurbtess\polyDBG.cc \

-	libnurbs\nurbtess\polyUtil.cc \

-	libnurbs\nurbtess\primitiveStream.cc \

-	libnurbs\nurbtess\quicksort.cc \

-	libnurbs\nurbtess\rectBlock.cc \

-	libnurbs\nurbtess\sampleComp.cc \

-	libnurbs\nurbtess\sampleCompBot.cc \

-	libnurbs\nurbtess\sampleCompRight.cc \

-	libnurbs\nurbtess\sampleCompTop.cc \

-	libnurbs\nurbtess\sampleMonoPoly.cc \

-	libnurbs\nurbtess\sampledLine.cc \

-	libnurbs\nurbtess\searchTree.cc

-

-GLU_SRCS = \

-	libtess\dict.c \

-	libtess\geom.c \

-	libtess\memalloc.c \

-	libtess\mesh.c \

-	libtess\normal.c \

-	libtess\priorityq.c \

-	libtess\render.c \

-	libtess\sweep.c \

-	libtess\tess.c \

-	libtess\tessmono.c \

-	libutil\error.c \

-	libutil\glue.c \

-	libutil\mipmap.c \

-	libutil\project.c \

-	libutil\quad.c \

-	libutil\registry.c

-

-SRCS	= $(GLU_SRCS)

-

-GLUDLL	= glu32.dll

-

-all	: gludll install

-

-!include "$(TOP)/mesawin32.mak"

-

-gludll	: $(GLUDLL)

-

-CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32

-LFLAGS	= $(dlllflags) $(LFLAGS)

-

-OBJS	= $(GLU_SRCS:.c=.obj)

-LIBS	= ../lib/opengl32.lib winmm.lib $(guilibsdll)

-

-# Uncomment these definitions to try to compile the NURBS code.

-#OBJS	= $(GLU_SRCS_CC:.cc=.obj) $(GLU_SRCS:.c=.obj)

-#NURBSINC = -Ilibnurbs\interface -Ilibnurbs\internals -Ilibnurbs\nurbtess 

-#CFLAGS  = $(CFLAGS) $(NURBSINC)

-

-$(GLUDLL)	: $(OBJS) glu.def

-	$(link) $(LFLAGS) -out:$(GLUDLL) -def:glu.def $(OBJS) $(LIBS)

-

-install	: $(GLUDLL)

-	@echo "copying Mesa GLU dynamic link library to system directory..."

-	-copy $(GLUDLL) $(TOP)\lib

-	@echo "copying Mesa GLU import library to library directory..."

-	-copy $(GLU) $(TOP)\lib

-

-clean	::

-	@del /f libtess\*.obj libutil\*.obj 

-	@del /f libnurbs\interface\*.obj libnurbs\internals\*.obj 

-	@del /f libnurbs\nurbtess\*.obj

-

-# override default inference rule with one that writes the object to

-# the correct subdir. 

-

-.c.obj	:

-	$(cc) $(CFLAGS) -I. $< /Fo$*.obj

-

-# /TP is needed for C++ files because MS compiler

-# does not recognize .cc as a C++ file.

-

-.cc.obj	:

-	$(cc) $(CFLAGS) -I. $< /TP /Fo$*.obj

+# Makefile for Win32
+
+#
+# Sept 12, 2001
+# Note: The nurbs code is not being built at this time.
+# If you want to work on it, uncomment the definitions
+# noted below to try to compile the sources.
+# There are numerous problems, some of which may be solved
+# by setting some #defines.
+#
+
+!include <win32.mak>
+
+.SUFFIXES : .cc
+
+TOP = ..
+
+GLU_SRCS_CC = \
+	libnurbs\interface\bezierEval.cc \
+	libnurbs\interface\bezierPatch.cc \
+	libnurbs\interface\bezierPatchMesh.cc \
+	libnurbs\interface\glcurveval.cc \
+	libnurbs\interface\glinterface.cc \
+	libnurbs\interface\glrenderer.cc \
+	libnurbs\interface\glsurfeval.cc \
+	libnurbs\interface\incurveeval.cc \
+	libnurbs\interface\insurfeval.cc \
+	libnurbs\internals\arc.cc \
+	libnurbs\internals\arcsorter.cc \
+	libnurbs\internals\arctess.cc \
+	libnurbs\internals\backend.cc \
+	libnurbs\internals\basiccrveval.cc \
+	libnurbs\internals\basicsurfeval.cc \
+	libnurbs\internals\bin.cc \
+	libnurbs\internals\bufpool.cc \
+	libnurbs\internals\cachingeval.cc \
+	libnurbs\internals\ccw.cc \
+	libnurbs\internals\coveandtiler.cc \
+	libnurbs\internals\curve.cc \
+	libnurbs\internals\curvelist.cc \
+	libnurbs\internals\curvesub.cc \
+	libnurbs\internals\dataTransform.cc \
+	libnurbs\internals\displaylist.cc \
+	libnurbs\internals\flist.cc \
+	libnurbs\internals\flistsorter.cc \
+	libnurbs\internals\hull.cc \
+	libnurbs\internals\intersect.cc \
+	libnurbs\internals\knotvector.cc \
+	libnurbs\internals\mapdesc.cc \
+	libnurbs\internals\mapdescv.cc \
+	libnurbs\internals\maplist.cc \
+	libnurbs\internals\mesher.cc \
+	libnurbs\internals\monoTriangulationBackend.cc \
+	libnurbs\internals\monotonizer.cc \
+	libnurbs\internals\mycode.cc \
+	libnurbs\internals\nurbsinterfac.cc \
+	libnurbs\internals\nurbstess.cc \
+	libnurbs\internals\patch.cc \
+	libnurbs\internals\patchlist.cc \
+	libnurbs\internals\quilt.cc \
+	libnurbs\internals\reader.cc \
+	libnurbs\internals\renderhints.cc \
+	libnurbs\internals\slicer.cc \
+	libnurbs\internals\sorter.cc \
+	libnurbs\internals\splitarcs.cc \
+	libnurbs\internals\subdivider.cc \
+	libnurbs\internals\tobezier.cc \
+	libnurbs\internals\trimline.cc \
+	libnurbs\internals\trimregion.cc \
+	libnurbs\internals\trimvertpool.cc \
+	libnurbs\internals\uarray.cc \
+	libnurbs\internals\varray.cc \
+	libnurbs\nurbtess\directedLine.cc \
+	libnurbs\nurbtess\gridWrap.cc \
+	libnurbs\nurbtess\monoChain.cc \
+	libnurbs\nurbtess\monoPolyPart.cc \
+	libnurbs\nurbtess\monoTriangulation.cc \
+	libnurbs\nurbtess\partitionX.cc \
+	libnurbs\nurbtess\partitionY.cc \
+	libnurbs\nurbtess\polyDBG.cc \
+	libnurbs\nurbtess\polyUtil.cc \
+	libnurbs\nurbtess\primitiveStream.cc \
+	libnurbs\nurbtess\quicksort.cc \
+	libnurbs\nurbtess\rectBlock.cc \
+	libnurbs\nurbtess\sampleComp.cc \
+	libnurbs\nurbtess\sampleCompBot.cc \
+	libnurbs\nurbtess\sampleCompRight.cc \
+	libnurbs\nurbtess\sampleCompTop.cc \
+	libnurbs\nurbtess\sampleMonoPoly.cc \
+	libnurbs\nurbtess\sampledLine.cc \
+	libnurbs\nurbtess\searchTree.cc
+
+GLU_SRCS = \
+	libtess\dict.c \
+	libtess\geom.c \
+	libtess\memalloc.c \
+	libtess\mesh.c \
+	libtess\normal.c \
+	libtess\priorityq.c \
+	libtess\render.c \
+	libtess\sweep.c \
+	libtess\tess.c \
+	libtess\tessmono.c \
+	libutil\error.c \
+	libutil\glue.c \
+	libutil\mipmap.c \
+	libutil\project.c \
+	libutil\quad.c \
+	libutil\registry.c
+
+SRCS	= $(GLU_SRCS)
+
+GLUDLL	= glu32.dll
+
+all	: gludll install
+
+!include "$(TOP)/mesawin32.mak"
+
+gludll	: $(GLUDLL)
+
+CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32
+LFLAGS	= $(dlllflags) $(LFLAGS)
+
+OBJS	= $(GLU_SRCS:.c=.obj)
+LIBS	= ../lib/opengl32.lib winmm.lib $(guilibsdll)
+
+# Uncomment these definitions to try to compile the NURBS code.
+#OBJS	= $(GLU_SRCS_CC:.cc=.obj) $(GLU_SRCS:.c=.obj)
+#NURBSINC = -Ilibnurbs\interface -Ilibnurbs\internals -Ilibnurbs\nurbtess 
+#CFLAGS  = $(CFLAGS) $(NURBSINC)
+
+$(GLUDLL)	: $(OBJS) glu.def
+	$(link) $(LFLAGS) -out:$(GLUDLL) -def:glu.def $(OBJS) $(LIBS)
+
+install	: $(GLUDLL)
+	@echo "copying Mesa GLU dynamic link library to system directory..."
+	-copy $(GLUDLL) $(TOP)\lib
+	@echo "copying Mesa GLU import library to library directory..."
+	-copy $(GLU) $(TOP)\lib
+
+clean	::
+	@del /f libtess\*.obj libutil\*.obj 
+	@del /f libnurbs\interface\*.obj libnurbs\internals\*.obj 
+	@del /f libnurbs\nurbtess\*.obj
+
+# override default inference rule with one that writes the object to
+# the correct subdir. 
+
+.c.obj	:
+	$(cc) $(CFLAGS) -I. $< /Fo$*.obj
+
+# /TP is needed for C++ files because MS compiler
+# does not recognize .cc as a C++ file.
+
+.cc.obj	:
+	$(cc) $(CFLAGS) -I. $< /TP /Fo$*.obj