diff options
author | Karl Schultz <[email protected]> | 2001-11-29 16:16:55 +0000 |
---|---|---|
committer | Karl Schultz <[email protected]> | 2001-11-29 16:16:55 +0000 |
commit | 9c8cbe6950096c4ec2fd1963edbc6c993c86947f (patch) | |
tree | 3dcf4a5d511c59e94f25740afb028ca5e7fca8ca /src/glu/sgi/Makefile.win | |
parent | 4e6c835210bd0e8e8467a1c75723af6af4b41fb4 (diff) |
Fix compilation errors and warnings for NURBS support. (Robert Bergkvist)
Diffstat (limited to 'src/glu/sgi/Makefile.win')
-rw-r--r-- | src/glu/sgi/Makefile.win | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/glu/sgi/Makefile.win b/src/glu/sgi/Makefile.win index 33349c326d1..9321732ef00 100644 --- a/src/glu/sgi/Makefile.win +++ b/src/glu/sgi/Makefile.win @@ -1,14 +1,5 @@ # 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 @@ -116,16 +107,14 @@ all : gludll gludll : $(GLUDLL) -CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32 +CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32 -DLIBRARYBUILD LFLAGS = $(dlllflags) $(lcommon) $(LFLAGS) -OBJS = $(GLU_SRCS:.c=.obj) LIBS = ../lib/$(MESALIB) 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) +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) |