diff options
| author | Karl Schultz <kschultz@freedesktop.org> | 2001-09-18 20:47:23 +0000 |
|---|---|---|
| committer | Karl Schultz <kschultz@freedesktop.org> | 2001-09-18 20:47:23 +0000 |
| commit | 573dd2206b1f3653fd10796e1de13c058d878e32 (patch) | |
| tree | d2dc4e69218e8da9fca2ae2f6fb48ea2e017dbb4 /src/glu | |
| parent | 4742735a5c22f2400a2777965e08e757ec384979 (diff) | |
clean up makefiles some more for Windows
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/sgi/Makefile.win | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/glu/sgi/Makefile.win b/src/glu/sgi/Makefile.win index 3d0067ef01..236731a7a0 100644 --- a/src/glu/sgi/Makefile.win +++ b/src/glu/sgi/Makefile.win @@ -110,9 +110,7 @@ GLU_SRCS = \ SRCS = $(GLU_SRCS) -GLUDLL = glu32.dll - -all : gludll install +all : gludll !include "$(TOP)/mesawin32.mak" @@ -122,21 +120,27 @@ CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32 LFLAGS = $(dlllflags) $(LFLAGS) OBJS = $(GLU_SRCS:.c=.obj) -LIBS = ../lib/opengl32.lib winmm.lib $(guilibsdll) +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) -$(GLUDLL) : $(OBJS) glu.def +$(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..." + @echo "copying Mesa GLU dynamic link library to library directory..." -copy $(GLUDLL) $(TOP)\lib @echo "copying Mesa GLU import library to library directory..." - -copy $(GLU) $(TOP)\lib + -copy $(GLULIB) $(TOP)\lib + +install : $(GLUDLL) $(GLULIB) + @echo "copying Mesa GLU dynamic link library to system directory..." + -copy $(GLUDLL) $(DLLINSTALL) + @echo "copying Mesa GLU header files to include directory..." + -copy ..\..\include\GL\glu.h $(INCLUDEINSTALL) + @echo "copying Mesa GLU import library to system library directory..." + -copy $(GLULIB) $(LIBINSTALL) clean :: @del /f libtess\*.obj libutil\*.obj @@ -144,7 +148,7 @@ clean :: @del /f libnurbs\nurbtess\*.obj # override default inference rule with one that writes the object to -# the correct subdir. +# the same subdir as the c file. .c.obj : $(cc) $(CFLAGS) -I. $< /Fo$*.obj |