X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2417bf69de4c386d0a532b9727e79f677d2869ec..67c20e133ebe01b5b4bc2468661a8bcc4097c5a2:/distrib/msw/tmake/vc.t?ds=sidebyside diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index b594d5d854..5791eddd07 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -92,7 +92,7 @@ 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 +# Set to 1 if you are using MSVC 5 USE_MSVC_5=0 # These are absolute paths, so that the compiler @@ -152,7 +152,6 @@ GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); NONESSENTIALOBJS= #$ ExpandList("WXNONESSENTIALOBJS"); COMMONOBJS = \ - $(COMMDIR)\$D\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); @@ -164,7 +163,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); # Add $(HTMLOBJS) if wanting wxHTML classes OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT) +ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT) SETUP_H=$(ARCHINCDIR)\wx\setup.h # Normal, static library @@ -294,7 +293,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) $(INCREMENTAL) -out:$(WXDIR)\lib\$(WXLIBNAME).dll - $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(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) + $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.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 @@ -322,9 +321,6 @@ $(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 @@ -340,9 +336,6 @@ $(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 @@ -394,7 +387,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@ png: cd $(WXDIR)\src\png - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 cd $(WXDIR)\src\msw clean_png: @@ -404,7 +397,7 @@ clean_png: zlib: cd $(WXDIR)\src\zlib - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 cd $(WXDIR)\src\msw clean_zlib: @@ -414,7 +407,7 @@ clean_zlib: jpeg: cd $(WXDIR)\src\jpeg - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_jpeg: @@ -424,7 +417,7 @@ clean_jpeg: tiff: cd $(WXDIR)\src\tiff - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_tiff: @@ -434,7 +427,7 @@ clean_tiff: regex: cd $(WXDIR)\src\regex - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all cd $(WXDIR)\src\msw clean_regex: @@ -448,11 +441,11 @@ rcparser: cd $(WXDIR)\src\msw 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 - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb - -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk + -erase ..\..\lib\$(WXLIBNAME).dll + -erase ..\..\lib\$(WXLIBNAME).lib + -erase ..\..\lib\$(WXLIBNAME).exp + -erase ..\..\lib\$(WXLIBNAME).pdb + -erase ..\..\lib\$(WXLIBNAME).ilk clean: $(PERIPH_CLEAN_TARGET) @@ -515,39 +508,43 @@ ps: wxps wxps: $(WXDIR)\docs\ps\wx.ps allhlp: wxhlp - cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.vc hlp - cd $(WXDIR)\utils\tex2rtf\src - nmake -f makefile.vc hlp - cd $(WXDIR)\contrib\src\fl - nmake -f makefile.vc hlp - cd $(THISDIR) + +# cd $(WXDIR)\utils\dialoged\src +# nmake -f makefile.vc hlp +# cd $(WXDIR)\utils\tex2rtf\src +# nmake -f makefile.vc hlp +# cd $(WXDIR)\contrib\src\fl +# 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 $(WXDIR)\contrib\src\fl - cd $(THISDIR) + +# cd $(WXDIR)\utils\dialoged\src +# nmake -f makefile.vc html +# cd $(WXDIR)\utils\tex2rtf\src +# nmake -f makefile.vc html +# cd $(WXDIR)\contrib\src\fl +# 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 $(WXDIR)\contrib\src\fl - nmake -f makefile.vc htmlhelp - cd $(THISDIR) + +# cd $(WXDIR)\utils\dialoged\src +# nmake -f makefile.vc htmlhelp +# cd $(WXDIR)\utils\tex2rtf\src +# nmake -f makefile.vc htmlhelp +# cd $(WXDIR)\contrib\src\fl +# 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 $(WXDIR)\contrib\src\fl - nmake -f makefile.vc htb - cd $(THISDIR) + +# cd $(WXDIR)\utils\dialoged\src +# nmake -f makefile.vc htb +# cd $(WXDIR)\utils\tex2rtf\src +# nmake -f makefile.vc htb +# cd $(WXDIR)\contrib\src\fl +# nmake -f makefile.vc htb +# cd $(THISDIR) allps: wxps referencps cd $(WXDIR)\utils\dialoged\src @@ -559,13 +556,13 @@ allps: wxps referencps 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 $(WXDIR)\contrib\src\fl - nmake -f makefile.vc pdfrtf - cd $(THISDIR) +# cd $(WXDIR)\utils\dialoged\src +# nmake -f makefile.vc pdfrtf +# cd $(WXDIR)\utils\tex2rtf\src +# nmake -f makefile.vc pdfrtf +# cd $(WXDIR)\contrib\src\fl +# 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 @@ -589,19 +586,26 @@ $(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) +# This target does two sets of HTML: one using a style sheet, for +# the purposes of the CHM file, and one without. $(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 + -mkdir $(DOCDIR)\mshtml + -mkdir $(DOCDIR)\mshtml\wx + copy *.gif $(DOCDIR)\mshtml\wx + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini -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 +$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp + cd $(DOCDIR)\mshtml\wx + copy $(DOCDIR)\latex\wx\wx.css . -hhc wx.hhp -mkdir ..\..\htmlhelp -erase $(DOCDIR)\htmlhelp\wx.chm