From 954f511473e4e8cf643751d1f7c03d59c0bd48bf Mon Sep 17 00:00:00 2001
From: Karl Schultz <kschultz@freedesktop.org>
Date: Tue, 25 Sep 2001 16:25:41 +0000
Subject: Fix up Windows makefiles so that the debug build leaves debugger info
 in the libraries.  Make with NODEBUG=1 builds optimized without debug info
 (doc'ed in top level Makefile.win).

---
 progs/demos/Makefile.win             | 4 ++--
 src/glu/sgi/Makefile.win             | 2 +-
 src/glut/glx/Makefile.win            | 2 +-
 src/mesa/drivers/osmesa/Makefile.win | 2 +-
 src/mesa/main/Makefile.win           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/progs/demos/Makefile.win b/progs/demos/Makefile.win
index 02efb7f6ed..eb9dc5978b 100644
--- a/progs/demos/Makefile.win
+++ b/progs/demos/Makefile.win
@@ -1,4 +1,4 @@
-# $Id: Makefile.win,v 1.3 2001/09/18 20:47:23 kschultz Exp $
+# $Id: Makefile.win,v 1.4 2001/09/25 16:25:41 kschultz Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -76,7 +76,7 @@ targets: readtex.c readtex.h $(PROGS)
 
 $(OSMESAEXES) : $*.obj
 	@echo $@
-	$(link) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS) $(EXTRALIBS)
+	$(link) $(lcommon) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS) $(EXTRALIBS)
 
 readtex.c:
 	@copy ../util/readtex.c .
diff --git a/src/glu/sgi/Makefile.win b/src/glu/sgi/Makefile.win
index 236731a7a0..33349c326d 100644
--- a/src/glu/sgi/Makefile.win
+++ b/src/glu/sgi/Makefile.win
@@ -117,7 +117,7 @@ all	: gludll
 gludll	: $(GLUDLL)
 
 CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -Iinclude -DBUILD_GL32
-LFLAGS	= $(dlllflags) $(LFLAGS)
+LFLAGS	= $(dlllflags) $(lcommon) $(LFLAGS)
 
 OBJS	= $(GLU_SRCS:.c=.obj)
 LIBS	= ../lib/$(MESALIB) winmm.lib $(guilibsdll)
diff --git a/src/glut/glx/Makefile.win b/src/glut/glx/Makefile.win
index 261bb7a6d6..cf0a3eb0cd 100644
--- a/src/glut/glx/Makefile.win
+++ b/src/glut/glx/Makefile.win
@@ -19,7 +19,7 @@ OPTIMIZE_CFLAGS = -DNDEBUG
 !ENDIF
 
 CFLAGS = $(cvarsdll) $(CFLAGS) $(OPTIMIZE_CFLAGS) -DMESA -DBUILD_GL32
-LFLAGS = $(dlllflags) $(LFLAGS)
+LFLAGS = $(dlllflags) $(lcommon) $(LFLAGS)
 
 OBJS   = $(SRCS:.c=.obj)
 MS_LIBS   = ../lib/$(MESALIB) ../lib/$(GLULIB) winmm.lib $(guilibsdll)
diff --git a/src/mesa/drivers/osmesa/Makefile.win b/src/mesa/drivers/osmesa/Makefile.win
index d6c11b169f..36d520e65d 100644
--- a/src/mesa/drivers/osmesa/Makefile.win
+++ b/src/mesa/drivers/osmesa/Makefile.win
@@ -20,7 +20,7 @@ all	: osmesadll
 osmesadll: $(OSMESADLL)
 
 CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -I$(TOP)/src
-LFLAGS	= $(LFLAGS) $(dlllflags)
+LFLAGS	= $(dlllflags) $(lcommon) $(LFLAGS)
 
 OBJS	= $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
 LIBS	= $(guilibsdll) $(TOP)/lib/$(MESALIB)
diff --git a/src/mesa/main/Makefile.win b/src/mesa/main/Makefile.win
index 2d2138fa8a..d3d9d7a3d2 100644
--- a/src/mesa/main/Makefile.win
+++ b/src/mesa/main/Makefile.win
@@ -154,7 +154,7 @@ all	: mesadll $(SUBDIRS)
 mesadll	: $(MESADLL)
 
 CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -DNO_PARALLEL -DNO_STEREO
-LFLAGS	= $(dlllflags) $(LFLAGS)
+LFLAGS	= $(dlllflags) $(lcommon) $(LFLAGS)
 
 OBJS	= $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
 LIBS	= winmm.lib $(guilibsdll)
-- 
cgit v1.2.3