Will now make glcanvas_d.lib if FINAL=0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/glcanvas/win/makefile.vc b/utils/glcanvas/win/makefile.vc
index 8d2c3fa2383676ab5cae8d7415d4ac2cd3adafad..29fe7e636c042d889abb5a54652525c8ae92394e 100644 (file)
--- a/utils/glcanvas/win/makefile.vc
+++ b/utils/glcanvas/win/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.nt
 # Author:      Julian Smart
 # Created:     1993
 # File:                makefile.nt
 # Author:      Julian Smart
 # Created:     1993

-# Updated:     
+# Updated:

 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"


@@ -19,16 +19,33 @@ EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
 DOCDIR=$(WXDIR)\docs
 LOCALDOCDIR=$(WXDIR)\utils\glcanvas\docs
 
 DOCDIR=$(WXDIR)\docs
 LOCALDOCDIR=$(WXDIR)\utils\glcanvas\docs
 

-LIBTARGET=$(WXDIR)\lib\glcanvas.lib
-OBJECTS = glcanvas.obj

 
 

-!include $(WXDIR)\src\makelib.vc
+!include $(WXDIR)\src\makevc.env

 
 

-glcanvas.obj:      glcanvas.h glcanvas.$(SRCSUFF) $(DUMMYOBJ)
+LIBTARGET=$(WXDIR)\lib\glcanvas$(LIBEXT).lib
+OBJECTS = $(D)\glcanvas.obj
+
+all:    $(D) $(LIBTARGET)
+
+$(D) :
+       mkdir $(D)
+
+$(LIBTARGET): $(OBJECTS)
+       -erase $(LIBTARGET)
+       $(implib) @<<
+-out:$(LIBTARGET)
+-machine:$(CPU)
+$(OBJECTS)
+<<
+
+$(D)\glcanvas.obj:      glcanvas.h glcanvas.$(SRCSUFF) $(DUMMYOBJ)

         $(cc) @<<
         $(cc) @<<

-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)

 <<
 
 <<
 

+
+
+

 DOCSOURCES=$(LOCALDOCDIR)\manual.tex $(LOCALDOCDIR)\classes.tex
 
 html: $(DOCDIR)\html\glcanvas\glcanvas.htm
 DOCSOURCES=$(LOCALDOCDIR)\manual.tex $(LOCALDOCDIR)\classes.tex
 
 html: $(DOCDIR)\html\glcanvas\glcanvas.htm