X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..c0b2a21e095458ab9b43f9b30d44ac228106c9c9:/distrib/msw/tmake/vc.t diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 5a2ffd1646..f1ebfbe598 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -79,9 +79,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 +86,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 @@ -235,6 +235,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) !if "$(USE_GLCANVAS)" == "1" GL_LIBS=opengl32.lib glu32.lib +# GL_LIBS_DELAY=/delayload:opengl32.dll !endif # Update the dynamic link library @@ -246,11 +247,12 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) 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 /delayload:winmm.dll /delayload:opengl32.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 @@ -473,42 +475,11 @@ allhlp: wxhlp 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 @@ -519,22 +490,12 @@ allpdfrtf: pdfrtf 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) @@ -586,6 +547,7 @@ $(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) @@ -627,8 +589,8 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi # 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 + -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) @@ -640,11 +602,14 @@ touchmanual: 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 + -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.