-# This file was automatically generated by tmake at 18:07, 2001/01/03
+# This file was automatically generated by tmake at 00:44, 2001/05/09
# 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"
..\generic\$D\logg.obj \
..\generic\$D\numdlgg.obj \
..\generic\$D\panelg.obj \
- ..\generic\$D\plot.obj \
..\generic\$D\progdlgg.obj \
..\generic\$D\prop.obj \
..\generic\$D\propform.obj \
..\generic\$D\listctrl.obj \
..\generic\$D\msgdlgg.obj \
..\generic\$D\notebook.obj \
+ ..\generic\$D\paletteg.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
..\generic\$D\statline.obj \
..\common\$D\imagpng.obj \
..\common\$D\imagpnm.obj \
..\common\$D\imagtiff.obj \
+ ..\common\$D\imagxpm.obj \
..\common\$D\intl.obj \
..\common\$D\ipcbase.obj \
..\common\$D\layout.obj \
..\common\$D\wincmn.obj \
..\common\$D\wxchar.obj \
..\common\$D\wxexpr.obj \
+ ..\common\$D\xpmdecod.obj \
..\common\$D\zipstrm.obj \
..\common\$D\zstream.obj
..\msw\$D\taskbar.obj \
..\msw\$D\tbar95.obj \
..\msw\$D\textctrl.obj \
+ ..\msw\$D\tglbtn.obj \
..\msw\$D\thread.obj \
..\msw\$D\timer.obj \
..\msw\$D\tooltip.obj \
..\msw\$D\utilsexc.obj \
..\msw\ole\$D\uuid.obj \
..\msw\$D\wave.obj \
- ..\msw\$D\window.obj \
- ..\msw\$D\xpmhand.obj
+ ..\msw\$D\window.obj
HTMLOBJS = ..\html\$D\helpctrl.obj \
..\html\$D\helpdata.obj \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
# Normal, static library
-all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+setuph:
+ cd $(WXDIR)\include\wx\msw
+ if not exist setup.h copy setup0.h setup.h
+ cd $(WXDIR)\src\msw
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
$D:
mkdir $D
### Static library
$(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
- -$(RM) $(LIBTARGET)
+ -erase $(LIBTARGET)
$(implib) @<<
-out:$@
-machine:$(CPU)
$(link) @<<
$(LINKFLAGS)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
- $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
+ $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
delayimp.lib
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
<<
-# If taking wxWindows from CVS, setup.h doesn't exist yet.
-# Actually the 'if not exist setup.h' test doesn't work
-# (copies the file anyway)
-# we'll have to comment this rule out.
-
-# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-# cd "$(WXDIR)"\include\wx\msw
-# if not exist setup.h copy setup0.h setup.h
-# cd "$(WXDIR)"\src\msw
-
..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c
cl @<<
$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
nmake -f makefile.vc clean
cd $(WXDIR)\src\msw
-xpm:
- cd $(WXDIR)\src\xpm
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
- cd $(WXDIR)\src\msw
-
-clean_xpm:
- cd $(WXDIR)\src\xpm
- nmake -f makefile.vc clean
- cd $(WXDIR)\src\msw
-
rcparser:
cd $(WXDIR)\utils\rcparser\src
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\src\msw
-cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
- -$(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
+cleanall: clean clean_png clean_zlib 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
clean: $(PERIPH_CLEAN_TARGET)
- -$(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
+ -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
-rmdir $(D)
-rmdir ole\$(D)
-rmdir ..\generic\$(D)
-rmdir ..\common\$(D)
-rmdir ..\html\$(D)
-
# Making documents
-docs: allhlp allhtml allpdfrtf htb htmlhelp
+docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
alldocs: docs
hlp: wxhlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp
allhlp: wxhlp
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc hlp
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc hlp
cd $(THISDIR)
allhtml: wxhtml
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc html
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc html
+ cd $(THISDIR)
+
+allhtmlhelp: htmlhelp
+ cd $(WXDIR)\utils\dialoged\src
+ nmake -f makefile.vc htmlhelp
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc htmlhelp
+ cd $(THISDIR)
+
+allhtb: htb
+ cd $(WXDIR)\utils\dialoged\src
+ nmake -f makefile.vc htb
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc htb
cd $(THISDIR)
allps: wxps referencps
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc ps
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc ps
cd $(THISDIR)
allpdfrtf: pdfrtf
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc pdfrtf
+ cd $(WXDIR)\utils\tex2rtf\src
+ nmake -f makefile.vc pdfrtf
cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
cd $(DOCDIR)/latex/wx
- -$(RM) wx.ph
+ -erase wx.ph
hc wx
- -$(RM) $(DOCDIR)\winhelp\wx.hlp
- -$(RM) $(DOCDIR)\winhelp\wx.cnt
+ -erase $(DOCDIR)\winhelp\wx.hlp
+ -erase $(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
- -$(RM) techref.ph
+ -erase 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
- -$(RM) $(DOCDIR)\html\wx\*.con
- -$(RM) $(DOCDIR)\html\wx\*.ref
- -$(RM) $(DOCDIR)\latex\wx\*.con
- -$(RM) $(DOCDIR)\latex\wx\*.ref
+ -erase $(DOCDIR)\html\wx\*.con
+ -erase $(DOCDIR)\html\wx\*.ref
+ -erase $(DOCDIR)\latex\wx\*.con
+ -erase $(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
+ -erase $(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
- -$(RM) wx.zip wx.htb
+ -erase wx.zip wx.htb
zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
-mkdir $(DOCDIR)\htb
move wx.zip $(DOCDIR)\htb\wx.htb
updatedocs: touchmanual alldocs
cleandocs:
- -$(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
+ -erase $(DOCDIR)\winhelp\wx.hlp
+ -erase $(DOCDIR)\winhelp\wx.cnt
+ -erase $(DOCDIR)\html\wx\*.htm
+ -erase $(DOCDIR)\pdf\wx.rtf
+ -erase $(DOCDIR)\latex\wx\wx.rtf
+ -erase $(DOCDIR)\latex\wx\WX.PH
+ -erase $(DOCDIR)\htmlhelp\wx.chm
+ -erase $(DOCDIR)\htb\wx.htb
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed.