X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/484523cf522b02385cd47c432d50d117940b46b9..4fdae9972d39fbe62adaa1c1d721ba1762cd8950:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 107fe650f1..f9eee306fd 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 18:07, 2001/01/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -17,6 +17,10 @@
 #
 !include <..\makevc.env>
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
@@ -27,9 +31,6 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
-# Please set these according to the settings in setup.h, so we can include
-# the appropriate libraries in wx.lib
-
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
@@ -37,6 +38,9 @@ PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
+# Set to 0 if not using GLCanvas (only affects DLL build)
+USE_GLCANVAS=1
+
 # These are absolute paths, so that the compiler
 # generates correct __FILE__ symbols for debugging.
 # Otherwise you don't be able to double-click on a memory
@@ -94,7 +98,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\logg.obj \
 		..\generic\$D\numdlgg.obj \
 		..\generic\$D\panelg.obj \
-		..\generic\$D\plot.obj \
+#		..\generic\$D\plot.obj \
 		..\generic\$D\progdlgg.obj \
 		..\generic\$D\prop.obj \
 		..\generic\$D\propform.obj \
@@ -104,10 +108,11 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\splash.obj \
 		..\generic\$D\splitter.obj \
 		..\generic\$D\statusbr.obj \
-		..\generic\$D\tabg.obj \
 		..\generic\$D\tbarsmpl.obj \
 		..\generic\$D\textdlgg.obj \
 		..\generic\$D\tipdlg.obj \
+		..\generic\$D\tipwin.obj \
+		..\generic\$D\treectlg.obj \
 		..\generic\$D\treelay.obj \
 		..\generic\$D\wizard.obj
 
@@ -130,7 +135,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 		..\generic\$D\printps.obj \
 		..\generic\$D\prntdlgg.obj \
 		..\generic\$D\statline.obj \
-		..\generic\$D\treectlg.obj
+		..\generic\$D\tabg.obj
 
 COMMONOBJS = \
 		..\common\$D\y_tab.obj \
@@ -140,6 +145,7 @@ COMMONOBJS = \
 		..\common\$D\cmdline.obj \
 		..\common\$D\cmndata.obj \
 		..\common\$D\config.obj \
+		..\common\$D\cshelp.obj \
 		..\common\$D\ctrlcmn.obj \
 		..\common\$D\ctrlsub.obj \
 		..\common\$D\datetime.obj \
@@ -162,6 +168,7 @@ COMMONOBJS = \
 		..\common\$D\file.obj \
 		..\common\$D\fileconf.obj \
 		..\common\$D\filefn.obj \
+		..\common\$D\filename.obj \
 		..\common\$D\filesys.obj \
 		..\common\$D\fontcmn.obj \
 		..\common\$D\fontmap.obj \
@@ -192,6 +199,7 @@ COMMONOBJS = \
 		..\common\$D\list.obj \
 		..\common\$D\log.obj \
 		..\common\$D\longlong.obj \
+		..\common\$D\matrix.obj \
 		..\common\$D\memory.obj \
 		..\common\$D\menucmn.obj \
 		..\common\$D\mimecmn.obj \
@@ -425,7 +433,7 @@ pch1:   dirs $(DUMMYOBJ)
 ### Static library
 
 $(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-	-erase $(LIBTARGET)
+	-$(RM) $(LIBTARGET)
 	$(implib) @<<
 -out:$@
 -machine:$(CPU)
@@ -446,7 +454,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
-GL_LIBS_DELAY=/delayload:opengl32.dll
+# GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
 # Update the dynamic link library
@@ -627,36 +635,37 @@ rcparser:
     cd $(WXDIR)\src\msw
 
 cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+        -$(RM) ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
+        -$(RM) ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
+        -$(RM) ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
+        -$(RM) ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
+        -$(RM) ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
 
 
 clean: $(PERIPH_CLEAN_TARGET)
-        -erase $(LIBTARGET)
-        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
-        -erase *.pdb
-        -erase *.sbr
-        -erase $(WXLIBNAME).pch
-        -erase $(GENDIR)\$D\*.obj
-        -erase $(GENDIR)\$D\*.pdb
-        -erase $(GENDIR)\$D\*.sbr
-        -erase $(COMMDIR)\$D\*.obj
-        -erase $(COMMDIR)\$D\*.pdb
-        -erase $(COMMDIR)\$D\*.sbr
-        -erase $(COMMDIR)\y_tab.c
-        -erase $(COMMDIR)\lex_yy.c
-        -erase $(MSWDIR)\$D\*.obj
-        -erase $(MSWDIR)\$D\*.sbr
-        -erase $(MSWDIR)\$D\*.pdb
-        -erase $(OLEDIR)\$D\*.obj
-        -erase $(OLEDIR)\$D\*.sbr
-        -erase $(OLEDIR)\$D\*.pdb
-        -erase $(HTMLDIR)\$D\*.obj
-        -erase $(HTMLDIR)\$D\*.sbr
-        -erase $(HTMLDIR)\$D\*.pdb
+        -$(RM) $(LIBTARGET)
+        -$(RM) $(WXDIR)\lib\$(WXLIBNAME).pdb
+        -$(RM) *.pdb
+        -$(RM) *.sbr
+        -$(RM) $(WXLIBNAME).pch
+        -$(RM) $(GENDIR)\$D\*.obj
+        -$(RM) $(GENDIR)\$D\*.pdb
+        -$(RM) $(GENDIR)\$D\*.sbr
+        -$(RM) $(COMMDIR)\$D\*.obj
+        -$(RM) $(COMMDIR)\$D\*.pdb
+        -$(RM) $(COMMDIR)\$D\*.sbr
+        -$(RM) $(COMMDIR)\y_tab.c
+        -$(RM) $(COMMDIR)\lex_yy.c
+        -$(RM) $(MSWDIR)\$D\*.obj
+        -$(RM) $(MSWDIR)\$D\*.sbr
+        -$(RM) $(MSWDIR)\$D\*.pdb
+        -$(RM) $(OLEDIR)\$D\*.obj
+        -$(RM) $(OLEDIR)\$D\*.sbr
+        -$(RM) $(OLEDIR)\$D\*.pdb
+        -$(RM) $(HTMLDIR)\$D\*.obj
+        -$(RM) $(HTMLDIR)\$D\*.sbr
+        -$(RM) $(HTMLDIR)\$D\*.pdb
+        -$(RM) $(D)\*.pch
         -rmdir $(D)
         -rmdir ole\$(D)
         -rmdir ..\generic\$(D)
@@ -686,42 +695,11 @@ allhlp: wxhlp
         nmake -f makefile.vc hlp
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgrid\src
-#        nmake -f makefile.vc hlp
-
 allhtml: wxhtml
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
         cd $(THISDIR)
 
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc html
-
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
@@ -732,29 +710,19 @@ allpdfrtf: pdfrtf
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc ps
-#        cd $(THISDIR)
-
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
-        -erase wx.ph
+        -$(RM) wx.ph
         hc wx
+        -$(RM) $(DOCDIR)\winhelp\wx.hlp
+        -$(RM) $(DOCDIR)\winhelp\wx.cnt
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
-        -erase techref.ph
+        -$(RM) techref.ph
         hc techref
         move techref.hlp $(DOCDIR)\winhelp\techref.hlp
         move techref.cnt $(DOCDIR)\winhelp\techref.cnt
@@ -789,16 +757,17 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-        -erase $(DOCDIR)\html\wx\*.con
-        -erase $(DOCDIR)\html\wx\*.ref
-        -erase $(DOCDIR)\latex\wx\*.con
-        -erase $(DOCDIR)\latex\wx\*.ref
+        -$(RM) $(DOCDIR)\html\wx\*.con
+        -$(RM) $(DOCDIR)\html\wx\*.ref
+        -$(RM) $(DOCDIR)\latex\wx\*.con
+        -$(RM) $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
 $(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
 	cd $(DOCDIR)\html\wx
 	-hhc wx.hhp
     -mkdir ..\..\htmlhelp
+    -$(RM) $(DOCDIR)\htmlhelp\wx.chm
     move wx.chm ..\..\htmlhelp
 	cd $(THISDIR)
 
@@ -840,8 +809,8 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
 	cd $(WXDIR)\docs\html\wx
-    -erase /Y wx.zip wx.htb
-    zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -$(RM) wx.zip wx.htb
+    zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
@@ -853,11 +822,14 @@ touchmanual:
 updatedocs: touchmanual alldocs
 
 cleandocs:
-    -erase /Y $(DOCDIR)\html\wx\wx.htm
-    -erase /Y $(DOCDIR)\pdf\wx.rtf
-    -erase /Y $(DOCDIR)\latex\wx\wx.rtf
-    -erase /Y $(DOCDIR)\htmlhelp\wx.chm
-    -erase /Y $(DOCDIR)\htb\wx.htb
+    -$(RM) $(DOCDIR)\winhelp\wx.hlp
+    -$(RM) $(DOCDIR)\winhelp\wx.cnt
+    -$(RM) $(DOCDIR)\html\wx\*.htm
+    -$(RM) $(DOCDIR)\pdf\wx.rtf
+    -$(RM) $(DOCDIR)\latex\wx\wx.rtf
+    -$(RM) $(DOCDIR)\latex\wx\WX.PH
+    -$(RM) $(DOCDIR)\htmlhelp\wx.chm
+    -$(RM) $(DOCDIR)\htb\wx.htb
 
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.