X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecc888a08f905503c614c9e845d37797ab78bbd9..bb16e81453a02433f2a313037b1c9b62681b45b8:/distrib/msw/tmake/vc.t diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 435300d50c..240033f3ef 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -13,6 +13,8 @@ #! now transform these hashes into $project tags foreach $file (sort keys %wxGeneric) { + next if $wxGeneric{$file} =~ /\bU\b/; + my $tag = ""; if ( $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/ ) { $tag = "WXNONESSENTIALOBJS"; @@ -22,31 +24,34 @@ } $file =~ s/cp?p?$/obj/; - $project{$tag} .= "..\\generic\\\$D\\" . $file . " " + $project{$tag} .= "\$(GENDIR)\\\$D\\" . $file . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\b16\b/; $file =~ s/cp?p?$/obj/; - $project{"WXCOMMONOBJS"} .= "..\\common\\\$D\\" . $file . " " + $project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\\$D\\" . $file . " " } foreach $file (sort keys %wxMSW) { next if $wxMSW{$file} =~ /\b16\b/; #! OLE files live in a subdir - $project{"WXMSWOBJS"} .= '..\msw\\'; - $project{"WXMSWOBJS"} .= 'ole\\' if $wxMSW{$file} =~ /\bO\b/; + if( $wxMSW{$file} =~ /\bO\b/ ) { + $project{"WXMSWOBJS"} .= '$(OLEDIR)'; + } else { + $project{"WXMSWOBJS"} .= '$(MSWDIR)'; + } $file =~ s/cp?p?$/obj/; - $project{"WXMSWOBJS"} .= '$D\\' . $file . " "; + $project{"WXMSWOBJS"} .= '\\$D\\' . $file . " "; } foreach $file (sort keys %wxHTML) { next if $wxHTML{$file} =~ /\b16\b/; $file =~ s/cp?p?$/obj/; - $project{"WXHTMLOBJS"} .= "..\\html\\\$D\\" . $file . " " + $project{"WXHTMLOBJS"} .= "\$(HTMLDIR)\\\$D\\" . $file . " " } #$} @@ -79,9 +84,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 @@ -89,6 +91,12 @@ PERIPH_LIBS= PERIPH_TARGET= PERIPH_CLEAN_TARGET= +# Set to 0 if not using GLCanvas (only affects DLL build) +USE_GLCANVAS=1 + +# Set to 0 if you are using MSVC 5 +USE_MSVC_5=0 + # 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 @@ -99,38 +107,42 @@ OLEDIR=ole MSWDIR=$(WXDIR)\src\msw DOCDIR = $(WXDIR)\docs HTMLDIR = $(WXDIR)\src\html +JPEGDIR = $(WXDIR)\src\jpeg +TIFFDIR = $(WXDIR)\src\tiff +REGEXDIR = $(WXDIR)\src\regex -{..\generic}.cpp{..\generic\$D}.obj: + +{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << -{..\common}.cpp{..\common\$D}.obj: +{$(COMMDIR)}.cpp{$(COMMDIR)\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << -{..\common}.c{..\common\$D}.obj: +{$(COMMDIR)}.c{$(COMMDIR)\$D}.obj: cl @<< $(CPPFLAGS2) /Fo$@ /c /Tc $< << -{..\msw}.cpp{..\msw\$D}.obj: +{$(MSWDIR)}.cpp{$(MSWDIR)\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << -{..\msw}.c{..\msw\$D}.obj: +{$(MSWDIR)}.c{$(MSWDIR)\$D}.obj: cl @<< $(CPPFLAGS2) /Fo$@ /c /Tc $< << -{..\msw\ole}.cpp{..\msw\ole\$D}.obj: +{$(OLEDIR)}.cpp{$(OLEDIR)\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << -{..\html}.cpp{..\html\$D}.obj: +{$(HTMLDIR)}.cpp{$(HTMLDIR)\$D}.obj: cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << @@ -142,7 +154,7 @@ GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); NONESSENTIALOBJS= #$ ExpandList("WXNONESSENTIALOBJS"); COMMONOBJS = \ - ..\common\$D\y_tab.obj \ + $(COMMDIR)\$D\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); @@ -154,14 +166,20 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); # Add $(HTMLOBJS) if wanting wxHTML classes OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) +ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT) +SETUP_H=$(ARCHINCDIR)\wx\setup.h + # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) +all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET) -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D +$(ARCHINCDIR)\wx: + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx +$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h + copy $(WXDIR)\include\wx\msw\setup.h $@ -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 $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D $D: mkdir $D @@ -181,20 +199,33 @@ $(OLEDIR)\$D: $(HTMLDIR)\$D: mkdir $(HTMLDIR)\$D +$(JPEGDIR)\$D: + mkdir $(JPEGDIR)\$D + +$(TIFFDIR)\$D: + mkdir $(TIFFDIR)\$D + +$(REGEXDIR)\$D: + mkdir $(REGEXDIR)\$D + +$(WXDIR)\$D: + mkdir $(WXDIR)\$D + + # wxWindows library as DLL dll: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) cleandll: - nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) + nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) # wxWindows + app as DLL. Only affects main.cpp. dllapp: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) # wxWindows + app as DLL, for Netscape plugin - remove DllMain. dllnp: - nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 + nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) # Use this to make dummy.obj and generate a PCH. # You might use the dll target, then the pch target, in order to @@ -221,7 +252,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 @@ -236,30 +267,51 @@ $(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 + +!if "$(USE_MSVC_5)" == "1" +# we are too big +INCREMENTAL=/INCREMENTAL:NO +DELAY_LOAD= +!else +INCREMENTAL= +DELAY_LOAD=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 + # Update the dynamic link library $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< - $(LINKFLAGS) + $(LINKFLAGS) $(INCREMENTAL) -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\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 $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) << !endif +# /delayload:winmm.dll # Removed because it can cause a crash for some people ######################################################## # Windows-specific objects -$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h +$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp -$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h +$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) cl @<< $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp << # Compile certain files with no optimization (some files cause a -# compiler crash for buggy versions of VC++, e.g. 4.0) +# 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 @@ -269,6 +321,9 @@ $(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 @@ -281,6 +336,9 @@ $(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 @@ -316,30 +374,20 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp $(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 +$(COMMDIR)\$D\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c cl @<< -$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ +$(CPPFLAGS2) /c $(COMMDIR)\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ << -..\common\y_tab.c: ..\common\dosyacc.c - copy "..\common"\dosyacc.c "..\common"\y_tab.c +$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c + copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c -..\common\lex_yy.c: ..\common\doslex.c - copy "..\common"\doslex.c "..\common"\lex_yy.c +$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c + copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c -$(OBJECTS): $(WXDIR)/include/wx/setup.h +$(OBJECTS): $(SETUP_H) -..\common\$D\unzip.obj: ..\common\unzip.c +$(COMMDIR)\$D\unzip.obj: $(COMMDIR)\unzip.c cl @<< $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@ << @@ -386,13 +434,13 @@ clean_tiff: 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) +regex: + cd $(WXDIR)\src\regex + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all cd $(WXDIR)\src\msw -clean_xpm: - cd $(WXDIR)\src\xpm +clean_regex: + cd $(WXDIR)\src\regex nmake -f makefile.vc clean cd $(WXDIR)\src\msw @@ -401,7 +449,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff +cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp @@ -421,26 +469,37 @@ clean: $(PERIPH_CLEAN_TARGET) -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) - + -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 wxhlp: $(DOCDIR)/winhelp/wx.hlp @@ -449,8 +508,9 @@ rtf: $(DOCDIR)/winhelp/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml +htb: $(DOCDIR)\htb\wx.htb wxhtml: $(DOCDIR)\html\wx\wx.htm -htmlhelp: $(DOCDIR)\html\wx\wx.chm +htmlhelp: $(DOCDIR)\htmlhelp\wx.chm ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps referencps: $(WXDIR)\docs\ps\referenc.ps @@ -458,70 +518,51 @@ referencps: $(WXDIR)\docs\ps\referenc.ps 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 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 +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) -# 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) @@ -561,6 +602,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 @@ -568,9 +610,12 @@ $(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) $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex @@ -605,12 +650,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