X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a98f98ac6f4422f259fc3324975156f7554adf41..4c5032ccd12366ab53b6c695c621307dd9705531:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 01c84d36e7..35f0b0f0f8 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 00:30, 2001/04/23 +# This file was automatically generated by tmake at 18:20, 2001/05/27 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -89,6 +89,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.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 \ @@ -149,6 +150,7 @@ COMMONOBJS = \ ..\common\$D\db.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 \ @@ -239,6 +241,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 @@ -342,8 +345,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 \ @@ -372,7 +374,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library -all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) +all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET) setuph: cd $(WXDIR)\include\wx\msw @@ -464,7 +466,7 @@ $(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 $(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 @@ -611,22 +613,12 @@ 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) - 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 +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 @@ -663,7 +655,6 @@ clean: $(PERIPH_CLEAN_TARGET) -rmdir ..\common\$(D) -rmdir ..\html\$(D) - # Making documents docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp alldocs: docs @@ -695,37 +686,38 @@ allhtml: wxhtml nmake -f makefile.vc html cd $(THISDIR) -allps: wxps referencps +allhtmlhelp: htmlhelp cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.vc ps + nmake -f makefile.vc htmlhelp + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc htmlhelp cd $(THISDIR) -allpdfrtf: pdfrtf +allhtb: htb cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.vc pdfrtf + nmake -f makefile.vc htb cd $(WXDIR)\utils\tex2rtf\src - nmake -f makefile.vc pdfrtf + nmake -f makefile.vc htb cd $(THISDIR) -allhtmlhelp: htmlhelp +allps: wxps referencps cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.vc htmlhelp + nmake -f makefile.vc ps cd $(WXDIR)\utils\tex2rtf\src - nmake -f makefile.vc htmlhelp + nmake -f makefile.vc ps cd $(THISDIR) -allhtb: htb +allpdfrtf: pdfrtf cd $(WXDIR)\utils\dialoged\src - nmake -f makefile.vc htb + nmake -f makefile.vc pdfrtf cd $(WXDIR)\utils\tex2rtf\src - nmake -f makefile.vc htb + 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 -erase wx.ph hc wx - -mkdir $(DOCDIR)\winhelp -erase $(DOCDIR)\winhelp\wx.hlp -erase $(DOCDIR)\winhelp\wx.cnt move wx.hlp $(DOCDIR)\winhelp\wx.hlp @@ -752,7 +744,6 @@ $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/wx.rtf: $(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)\pdf -copy *.wmf $(DOCDIR)\pdf -copy *.bmp $(DOCDIR)\pdf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf @@ -767,7 +758,6 @@ $(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 -mkdir $(DOCDIR)\html\wx copy *.gif $(DOCDIR)\html\wx -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html