X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e47faf150479ef1171b696bde7ba504c81af481..d1a8d972ea735b97320f5569592e58507968199b:/src/msw/makefile.vc?ds=sidebyside diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 2ccad8bb08..3d68ea7f54 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 10:04, 1999/11/06 +# This file was automatically generated by tmake at 14:52, 2001/07/02 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -27,9 +27,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 +34,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 @@ -47,6 +47,8 @@ OLEDIR=ole MSWDIR=$(WXDIR)\src\msw DOCDIR = $(WXDIR)\docs HTMLDIR = $(WXDIR)\src\html +JPEGDIR = $(WXDIR)\src\jpeg +TIFFDIR = $(WXDIR)\src\tiff {..\generic}.cpp{..\generic\$D}.obj: cl @<< @@ -84,8 +86,13 @@ $(CPPFLAGS) /Fo$@ /c /Tp $< << GENERICOBJS= ..\generic\$D\busyinfo.obj \ + ..\generic\$D\calctrl.obj \ ..\generic\$D\choicdgg.obj \ + ..\generic\$D\dirctrlg.obj \ + ..\generic\$D\dragimgg.obj \ ..\generic\$D\grid.obj \ + ..\generic\$D\gridctrl.obj \ + ..\generic\$D\gridsel.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\logg.obj \ ..\generic\$D\numdlgg.obj \ @@ -96,16 +103,21 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\proplist.obj \ ..\generic\$D\sashwin.obj \ ..\generic\$D\scrolwin.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 # These are generic things that don't need to be compiled on MSW, # but sometimes it's useful to do so for testing purposes. -NONESSENTIALOBJS= ..\generic\$D\caret.obj \ +NONESSENTIALOBJS= ..\generic\$D\accel.obj \ + ..\generic\$D\caret.obj \ ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dcpsg.obj \ ..\generic\$D\dirdlgg.obj \ @@ -119,45 +131,57 @@ NONESSENTIALOBJS= ..\generic\$D\caret.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 \ - ..\generic\$D\treectrl.obj + ..\generic\$D\tabg.obj COMMONOBJS = \ ..\common\$D\y_tab.obj \ ..\common\$D\appcmn.obj \ ..\common\$D\choiccmn.obj \ ..\common\$D\clipcmn.obj \ + ..\common\$D\cmdline.obj \ + ..\common\$D\cmdproc.obj \ ..\common\$D\cmndata.obj \ ..\common\$D\config.obj \ + ..\common\$D\cshelp.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ - ..\common\$D\date.obj \ + ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ + ..\common\$D\dbgrid.obj \ ..\common\$D\dbtable.obj \ ..\common\$D\dcbase.obj \ + ..\common\$D\dircmn.obj \ ..\common\$D\dlgcmn.obj \ + ..\common\$D\dndcmn.obj \ ..\common\$D\dobjcmn.obj \ ..\common\$D\docmdi.obj \ ..\common\$D\docview.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\effects.obj \ + ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ ..\common\$D\ffile.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\framecmn.obj \ ..\common\$D\fs_inet.obj \ + ..\common\$D\fs_mem.obj \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ ..\common\$D\gdicmn.obj \ + ..\common\$D\geometry.obj \ ..\common\$D\gifdecod.obj \ ..\common\$D\hash.obj \ ..\common\$D\helpbase.obj \ @@ -170,24 +194,31 @@ COMMONOBJS = \ ..\common\$D\imagpcx.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\lboxcmn.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\mimetype.obj \ + ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ ..\common\$D\object.obj \ ..\common\$D\objstrm.obj \ ..\common\$D\odbc.obj \ ..\common\$D\paper.obj \ + ..\common\$D\popupcmn.obj \ ..\common\$D\prntbase.obj \ ..\common\$D\process.obj \ ..\common\$D\protocol.obj \ + ..\common\$D\quantize.obj \ + ..\common\$D\radiocmn.obj \ ..\common\$D\resource.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ @@ -200,12 +231,11 @@ COMMONOBJS = \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ ..\common\$D\tbarbase.obj \ - ..\common\$D\tbarsmpl.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ - ..\common\$D\time.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ + ..\common\$D\treebase.obj \ ..\common\$D\txtstrm.obj \ ..\common\$D\unzip.obj \ ..\common\$D\url.obj \ @@ -218,6 +248,7 @@ COMMONOBJS = \ ..\common\$D\wincmn.obj \ ..\common\$D\wxchar.obj \ ..\common\$D\wxexpr.obj \ + ..\common\$D\xpmdecod.obj \ ..\common\$D\zipstrm.obj \ ..\common\$D\zstream.obj @@ -248,20 +279,28 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\dcscreen.obj \ ..\msw\$D\dde.obj \ ..\msw\$D\dialog.obj \ + ..\msw\$D\dialup.obj \ ..\msw\$D\dib.obj \ ..\msw\$D\dibutils.obj \ + ..\msw\$D\dir.obj \ ..\msw\$D\dirdlg.obj \ ..\msw\$D\dragimag.obj \ ..\msw\ole\$D\dropsrc.obj \ ..\msw\ole\$D\droptgt.obj \ + ..\msw\$D\enhmeta.obj \ ..\msw\$D\filedlg.obj \ ..\msw\$D\font.obj \ ..\msw\$D\fontdlg.obj \ + ..\msw\$D\fontenum.obj \ ..\msw\$D\fontutil.obj \ ..\msw\$D\frame.obj \ ..\msw\$D\gauge95.obj \ + ..\msw\$D\gdiimage.obj \ ..\msw\$D\gdiobj.obj \ + ..\msw\$D\glcanvas.obj \ ..\msw\$D\gsocket.obj \ + ..\msw\$D\gsockmsw.obj \ + ..\msw\$D\helpchm.obj \ ..\msw\$D\helpwin.obj \ ..\msw\$D\icon.obj \ ..\msw\$D\imaglist.obj \ @@ -273,6 +312,7 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\menu.obj \ ..\msw\$D\menuitem.obj \ ..\msw\$D\metafile.obj \ + ..\msw\$D\mimetype.obj \ ..\msw\$D\minifram.obj \ ..\msw\$D\msgdlg.obj \ ..\msw\$D\nativdlg.obj \ @@ -282,7 +322,6 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\palette.obj \ ..\msw\$D\pen.obj \ ..\msw\$D\penwin.obj \ - ..\msw\$D\pnghand.obj \ ..\msw\$D\printdlg.obj \ ..\msw\$D\printwin.obj \ ..\msw\$D\radiobox.obj \ @@ -293,6 +332,7 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\scrolbar.obj \ ..\msw\$D\settings.obj \ ..\msw\$D\slider95.obj \ + ..\msw\$D\snglinst.obj \ ..\msw\$D\spinbutt.obj \ ..\msw\$D\spinctrl.obj \ ..\msw\$D\statbmp.obj \ @@ -304,6 +344,7 @@ MSWOBJS = ..\msw\$D\accel.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 \ @@ -312,8 +353,7 @@ MSWOBJS = ..\msw\$D\accel.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 \ @@ -324,12 +364,14 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ ..\html\$D\htmltag.obj \ ..\html\$D\htmlwin.obj \ ..\html\$D\htmprint.obj \ + ..\html\$D\m_dflist.obj \ ..\html\$D\m_fonts.obj \ ..\html\$D\m_hline.obj \ ..\html\$D\m_image.obj \ ..\html\$D\m_layout.obj \ ..\html\$D\m_links.obj \ ..\html\$D\m_list.obj \ + ..\html\$D\m_meta.obj \ ..\html\$D\m_pre.obj \ ..\html\$D\m_tables.obj \ ..\html\$D\winpars.obj @@ -340,13 +382,14 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) - -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D +all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET) +setuph: + cd $(WXDIR)\include\wx\msw + if not exist setup.h copy setup0.h setup.h + cd $(WXDIR)\src\msw -test: $(MSWDIR)\$D\wave.obj -test2: ..\common\Debug\config.obj +dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $D: mkdir $D @@ -366,6 +409,12 @@ $(OLEDIR)\$D: $(HTMLDIR)\$D: mkdir $(HTMLDIR)\$D +$(JPEGDIR)\$D: + mkdir $(JPEGDIR)\$D + +$(TIFFDIR)\$D: + mkdir $(TIFFDIR)\$D + # wxWindows library as DLL dll: nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) @@ -406,7 +455,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS) $(implib) @<< -out:$@ -machine:$(CPU) -$(OBJECTS) $(PERIPH_LIBS) +$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS) << !else @@ -421,16 +470,26 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) -out:$(WXDIR)\lib\$(WXLIBNAME).lib << +!if "$(USE_GLCANVAS)" == "1" +GL_LIBS=opengl32.lib glu32.lib +# GL_LIBS_DELAY=/delayload:opengl32.dll +!endif + # Update the dynamic link library $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(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 $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.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 + /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY) << !endif +# /delayload:winmm.dll # Removed because it can cause a crash for some people ######################################################## # Windows-specific objects @@ -443,15 +502,70 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.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 +# Compile certain files with no optimization (some files cause a +# compiler crash for buggy versions of VC++, e.g. 4.0). +# Don't forget to put FINAL=1 on the command line. +noopt: + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp +<< ..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c cl @<< @@ -503,13 +617,13 @@ clean_jpeg: 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) +tiff: + cd $(WXDIR)\src\tiff + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all cd $(WXDIR)\src\msw -clean_xpm: - cd $(WXDIR)\src\xpm +clean_tiff: + cd $(WXDIR)\src\tiff nmake -f makefile.vc clean cd $(WXDIR)\src\msw @@ -518,14 +632,17 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg - -erase $(LIBTARGET) - -erase $(WXDIR)\lib\$(WXLIBNAME).pdb +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) + -erase $(LIBTARGET) + -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase *.pdb -erase *.sbr -erase $(WXLIBNAME).pch @@ -535,139 +652,104 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg -erase $(COMMDIR)\$D\*.obj -erase $(COMMDIR)\$D\*.pdb -erase $(COMMDIR)\$D\*.sbr - -erase $(COMMDIR)\\y_tab.c + -erase $(COMMDIR)\y_tab.c -erase $(COMMDIR)\lex_yy.c -erase $(MSWDIR)\$D\*.obj -erase $(MSWDIR)\$D\*.sbr -erase $(MSWDIR)\$D\*.pdb + -erase $(MSWDIR)\$D\*.pch -erase $(OLEDIR)\$D\*.obj -erase $(OLEDIR)\$D\*.sbr -erase $(OLEDIR)\$D\*.pdb -erase $(HTMLDIR)\$D\*.obj -erase $(HTMLDIR)\$D\*.sbr -erase $(HTMLDIR)\$D\*.pdb + -erase $(JPEGDIR)\$D\*.obj + -erase $(JPEGDIR)\$D\*.sbr + -erase $(JPEGDIR)\$D\*.idb + -erase $(JPEGDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.obj + -erase $(TIFFDIR)\$D\*.sbr + -erase $(TIFFDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.idb -rmdir $(D) - -rmdir ole\$(D) - -rmdir ..\generic\$(D) - -rmdir ..\common\$(D) - -rmdir ..\html\$(D) - -cleanall: clean + -rmdir $(GENDIR)\$(D) + -rmdir $(COMMDIR)\$(D) + -rmdir $(MSWDIR)\$(D) + -rmdir $(OLEDIR)\$(D) + -rmdir $(HTMLDIR)\$(D) + -rmdir $(JPEGDIR)\$(D) + -rmdir $(TIFFDIR)\$(D) # Making documents -docs: allhlp allhtml allpdfrtf +docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp alldocs: docs -hlp: wxhlp portinghlp +hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -prophlp: $(DOCDIR)/winhelp/prop.hlp refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf -proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf -html: wxhtml portinghtml +html: wxhtml +htb: $(DOCDIR)\htb\wx.htb wxhtml: $(DOCDIR)\html\wx\wx.htm -htmlhelp: $(DOCDIR)\html\wx\wx.chm -prophtml: $(DOCDIR)\html\proplist\prop.htm +htmlhelp: $(DOCDIR)\htmlhelp\wx.chm ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps -propps: $(WXDIR)\docs\ps\prop.ps referencps: $(WXDIR)\docs\ps\referenc.ps -portinghtml: $(DOCDIR)\html\porting\port.htm -portingrtf: $(DOCDIR)/winhelp/porting.rtf -portinghlp: $(DOCDIR)/winhelp/porting.hlp -portingpdfrtf: $(DOCDIR)/pdf/porting.rtf -portingps: $(WXDIR)\docs\ps\porting.ps - -allhlp: wxhlp portinghlp prophlp +allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc hlp + cd $(WXDIR)\utils\tex2rtf\src + 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 portinghtml prophtml +allhtml: wxhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html + cd $(WXDIR)\utils\tex2rtf\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 portingps propps +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 portingpdfrtf proppdfrtf +allpdfrtf: pdfrtf cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc pdfrtf + cd $(WXDIR)\utils\tex2rtf\src + 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 hc wx + -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/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj - cd $(DOCDIR)/latex/porting - -erase porting.ph - hc porting - move porting.hlp $(DOCDIR)\winhelp\porting.hlp - move porting.cnt $(DOCDIR)\winhelp\porting.cnt - cd $(THISDIR) - -$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj - cd $(DOCDIR)/latex/proplist - -erase prop.ph - hc prop - move prop.hlp $(DOCDIR)\winhelp\prop.hlp - move prop.cnt $(DOCDIR)\winhelp\prop.cnt - cd $(THISDIR) - $(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj cd $(DOCDIR)/latex/techref -erase techref.ph @@ -681,16 +763,6 @@ $(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/late -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex - cd $(DOCDIR)\latex\porting - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp - cd $(THISDIR) - -$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp - cd $(THISDIR) - $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp @@ -703,20 +775,6 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex - cd $(DOCDIR)\latex\porting - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf - cd $(THISDIR) - -$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf - cd $(THISDIR) - $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -copy *.wmf $(DOCDIR)\pdf @@ -727,6 +785,7 @@ $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex cd $(DOCDIR)\latex\wx -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 @@ -734,32 +793,14 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) -$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp +$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp cd $(DOCDIR)\html\wx -hhc wx.hhp + -mkdir ..\..\htmlhelp + -erase $(DOCDIR)\htmlhelp\wx.chm + move wx.chm ..\..\htmlhelp cd $(THISDIR) - -$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex - cd $(DOCDIR)\latex\porting - -mkdir $(DOCDIR)\html\porting - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html - -erase $(DOCDIR)\html\porting\*.con - -erase $(DOCDIR)\html\porting\*.ref - -erase $(DOCDIR)\latex\porting\*.con - -erase $(DOCDIR)\latex\porting\*.ref - cd $(THISDIR) - -$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex - cd $(DOCDIR)\latex\proplist - -mkdir $(DOCDIR)\html\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html - -erase $(DOCDIR)\html\proplist\*.con - -erase $(DOCDIR)\html\proplist\*.ref - -erase $(DOCDIR)\latex\proplist\*.con - -erase $(DOCDIR)\latex\proplist\*.ref - cd $(THISDIR) - $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex cd $(WXDIR)\docs\latex\wx -latex manual @@ -770,28 +811,12 @@ $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/w -latex manual cd $(THISDIR) -$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex - cd $(WXDIR)\docs\latex\porting - -latex porting - -latex porting - -makeindx porting - -bibtex porting - -latex porting - -latex porting - cd $(THISDIR) - $(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi cd $(WXDIR)\docs\latex\wx -dvips32 -o wx.ps manual move wx.ps $(WXDIR)\docs\ps\wx.ps cd $(THISDIR) -$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi - cd $(WXDIR)\docs\latex\porting - -dvips32 -o porting.ps porting - move porting.ps $(WXDIR)\docs\ps\porting.ps - cd $(THISDIR) - $(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex cd $(WXDIR)\docs\latex\wx -latex referenc @@ -808,12 +833,34 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi move referenc.ps $(WXDIR)\docs\ps\referenc.ps cd $(THISDIR) +# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk +# files, renamed to htb. +# This can then be used with e.g. helpview. +# 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 wx.zip wx.htb + zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk + -mkdir $(DOCDIR)\htb + move wx.zip $(DOCDIR)\htb\wx.htb + cd $(THISDIR) + # In order to force document reprocessing touchmanual: -touch $(WXDIR)\docs\latex\wx\manual.tex updatedocs: touchmanual alldocs +cleandocs: + -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. updatepdf: # touchmanual pdfrtf