summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorKarl Schultz <kschultz@freedesktop.org>2001-09-18 20:47:23 +0000
committerKarl Schultz <kschultz@freedesktop.org>2001-09-18 20:47:23 +0000
commit573dd2206b1f3653fd10796e1de13c058d878e32 (patch)
treed2dc4e69218e8da9fca2ae2f6fb48ea2e017dbb4 /src/mesa/main
parent4742735a5c22f2400a2777965e08e757ec384979 (diff)
clean up makefiles some more for Windows
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/Makefile.win10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/main/Makefile.win b/src/mesa/main/Makefile.win
index 3b78249ea97..65b6ed809ea 100644
--- a/src/mesa/main/Makefile.win
+++ b/src/mesa/main/Makefile.win
@@ -1,6 +1,6 @@
# Makefile for Win32
#
-# NOTE: the install target may overwrite important files in the system dir
+# NOTE: the install target may overwrite important files in the system dirs
# Sept 12, 2001
# Windows driver not working. OSMesa driver works.
#
@@ -157,7 +157,7 @@ CFLAGS = $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -DNO_PARALLEL -DNO_STER
LFLAGS = $(dlllflags) $(LFLAGS)
OBJS = $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
-LIBS = $(GLU) winmm.lib $(guilibsdll)
+LIBS = winmm.lib $(guilibsdll)
$(MESADLL) : $(OBJS) mesa.def
$(link) $(LFLAGS) -out:$(MESADLL) -def:mesa.def $(OBJS) $(LIBS)
@@ -174,6 +174,7 @@ $(SUBDIRS) :
@cd ..
install : $(MESADLL)
+ @echo.
@echo "copying Mesa dynamic link library to system directory..."
-copy $(MESADLL) $(DLLINSTALL)
@echo "copying Mesa header files to include directory..."
@@ -192,7 +193,10 @@ clean ::
@del /f osmesa\*.obj
@del /f Windows\*.obj
+clobber ::
+ @del /f OSmesa\*.lib
+
# override default inference rule with one that writes the object to
-# the correct subdir
+# the same subdir that the c file is in.
.c.obj :
$(cc) $(CFLAGS) -I. $< /Fo$*.obj