-# 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
#
!include <..\makevc.env>
+!if "$(RM)" == ""
+RM= erase
+!endif
+
THISDIR=$(WXWIN)\src\msw
!if "$(WXMAKINGDLL)" == "1"
DUMMYOBJ=$D\dummy.obj
!endif
+# This one overrides the others, to be consistent with the settings in setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=
..\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 \
..\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
..\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 \
..\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 \
..\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 \
..\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 \
### Static library
$(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
- -erase $(LIBTARGET)
+ -$(RM) $(LIBTARGET)
$(implib) @<<
-out:$@
-machine:$(CPU)
!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
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)
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
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
-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)
# 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)
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.