X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..90186e524e347a3a779c928a44fb7d744b3efcf7:/src/msw/makefile.nt diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index 2bacd2f7af..ef65744b9b 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -180,7 +180,9 @@ MSWOBJS = \ $(MSWDIR)\icon.obj \ $(MSWDIR)\iniconf.obj \ $(MSWDIR)\joystick.obj \ + $(MSWDIR)\imaglist.obj \ $(MSWDIR)\listbox.obj \ + $(MSWDIR)\listctrl.obj \ $(MSWDIR)\main.obj \ $(MSWDIR)\mdi.obj \ $(MSWDIR)\menu.obj \ @@ -189,6 +191,7 @@ MSWOBJS = \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ + $(MSWDIR)\notebook.obj \ $(MSWDIR)\ownerdrw.obj \ $(MSWDIR)\palette.obj \ $(MSWDIR)\pen.obj \ @@ -217,38 +220,24 @@ MSWOBJS = \ $(MSWDIR)\textctrl.obj \ $(MSWDIR)\thread.obj \ $(MSWDIR)\timer.obj \ + $(MSWDIR)\treectrl.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(OLEDIR)\uuid.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj \ - $(MSWDIR)\notebook.obj \ - $(MSWDIR)\listctrl.obj \ - $(MSWDIR)\imaglist.obj \ - $(MSWDIR)\treectrl.obj \ + $(MSWDIR)\xpmhand.obj \ + $(OLEDIR)\dataobj.obj \ + $(OLEDIR)\automtn.obj \ $(OLEDIR)\droptgt.obj \ $(OLEDIR)\dropsrc.obj \ - $(OLEDIR)\dataobj.obj \ - $(OLEDIR)\oleutils.obj \ - $(OLEDIR)\uuid.obj \ - $(OLEDIR)\automtn.obj - -XPMOBJECTS = $(XPMDIR)\crbuffri.obj\ - $(XPMDIR)\crdatfri.obj\ - $(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\ - $(XPMDIR)\crifrdat.obj\ - $(XPMDIR)\data.obj\ - $(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\ - $(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\ - $(XPMDIR)\rdftoi.obj\ - $(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\ - $(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\ - $(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj + $(OLEDIR)\oleutils.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # Normal, static library -all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib $(LIBTARGET) +all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET) # wxWindows library as DLL dll: @@ -578,6 +567,11 @@ $(MSWDIR)/pnghand.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << +$(MSWDIR)/xpmhand.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + $(MSWDIR)/printdlg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ @@ -1201,121 +1195,11 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ $(OBJECTS): $(WXDIR)/include/wx/setup.h -$(XPMDIR)\crbuffri.obj: $(XPMDIR)\crbuffri.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crbuffrp.obj: $(XPMDIR)\crbuffrp.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crdatfri.obj: $(XPMDIR)\crdatfri.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crdatfrp.obj: $(XPMDIR)\crdatfrp.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\create.obj: $(XPMDIR)\create.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crifrbuf.obj: $(XPMDIR)\crifrbuf.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crifrdat.obj: $(XPMDIR)\crifrdat.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\crpfrdat.obj: $(XPMDIR)\crpfrdat.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\data.obj: $(XPMDIR)\data.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\hashtab.obj: $(XPMDIR)\hashtab.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\misc.obj: $(XPMDIR)\misc.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\parse.obj: $(XPMDIR)\parse.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\rdftodat.obj: $(XPMDIR)\rdftodat.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\rdftoi.obj: $(XPMDIR)\rdftoi.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\rdftop.obj: $(XPMDIR)\rdftop.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\rgb.obj: $(XPMDIR)\rgb.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\scan.obj: $(XPMDIR)\scan.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\simx.obj: $(XPMDIR)\simx.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\wrffrdat.obj: $(XPMDIR)\wrffrdat.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\wrffri.obj: $(XPMDIR)\wrffri.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - -$(XPMDIR)\wrffrp.obj: $(XPMDIR)\wrffrp.c - cl @<< -$(CPPFLAGS2) /c $*.c /Fo$@ -<< - # Peripheral components png: cd $(WXDIR)\src\png - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_png: @@ -1325,7 +1209,7 @@ clean_png: zlib: cd $(WXDIR)\src\zlib - nmake -f makefile.nt FINAL=$(FINAL) + nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_zlib: @@ -1334,12 +1218,12 @@ clean_zlib: cd $(WXDIR)\src\msw xpm: - cd $(WXDIR)\src\wxxpm - nmake -f makefile.nt FINAL=$(FINAL) + cd $(WXDIR)\src\xpm + nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) cd $(WXDIR)\src\msw clean_xpm: - cd $(WXDIR)\src\wxxpm + cd $(WXDIR)\src\xpm nmake -f makefile.nt clean cd $(WXDIR)\src\msw @@ -1348,22 +1232,7 @@ rcparser: nmake -f makefile.nt FINAL=$(FINAL) cd $(WXDIR)\src\msw -wxstring: - cd $(WXDIR)\contrib\wxstring - nmake -f makefile.nt OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)" FINAL=$(FINAL) - cd $(WXDIR)\src\msw - -clean_wxstring: - cd $(WXDIR)\contrib\wxstring - nmake -f makefile.nt clean - cd $(WXDIR)\src\msw - -clean_rcp: - cd $(WXDIR)\utils\rcparser\src - nmake -f makefile.nt clean - cd $(WXDIR)\src\msw - -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm -erase *.obj -erase $(LIBTARGET) -erase $(WXDIR)\lib\*.pdb @@ -1404,23 +1273,23 @@ docs: allhlp allhtml allpdfrtf alldocs: docs hlp: wxhlp portinghlp # faqhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -wxprophlp: $(DOCDIR)/winhelp/wxprop.hlp +prophlp: $(DOCDIR)/winhelp/prop.hlp faqhlp: $(DOCDIR)/winhelp/faq.hlp refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf faqrtf: $(DOCDIR)/winhelp/faq.rtf -wxproprtf: $(DOCDIR)/winhelp/wxprop.rtf +proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf faqpdfrtf: $(DOCDIR)/pdf/faq.rtf -wxproppdfrtf: $(DOCDIR)/pdf/wxprop.rtf +proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml # faqhtml wxhtml: $(DOCDIR)\html\wx\wx.htm faqhtml: $(DOCDIR)\html\faq\faq.htm -wxprophtml: $(DOCDIR)\html\proplist\prop.htm +prophtml: $(DOCDIR)\html\proplist\prop.htm ps: wxps referencps # faqps wxps: $(WXDIR)\docs\ps\wx.ps -wxpropps: $(WXDIR)\docs\ps\wxprop.ps +propps: $(WXDIR)\docs\ps\prop.ps faqps: $(WXDIR)\docs\ps\faq.ps referencps: $(WXDIR)\docs\ps\referenc.ps @@ -1430,7 +1299,7 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp portingpdfrtf: $(DOCDIR)/pdf/porting.rtf portingps: $(WXDIR)\docs\ps\porting.ps -allhlp: wxhlp portinghlp wxprop # faqhlp +allhlp: wxhlp portinghlp prop # faqhlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.nt hlp cd $(THISDIR) @@ -1461,7 +1330,7 @@ allhlp: wxhlp portinghlp wxprop # faqhlp # cd $(WXDIR)\utils\clips2c\src # nmake -f makefile.nt hlp -allhtml: wxhtml portinghtml wxprophtml # faqhtml +allhtml: wxhtml portinghtml prophtml # faqhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.nt html cd $(THISDIR) @@ -1493,12 +1362,12 @@ allhtml: wxhtml portinghtml wxprophtml # faqhtml # cd $(WXDIR)\utils\clips2c\src # nmake -f makefile.nt html -allps: wxps referencps portingps wxpropps # faqps +allps: wxps referencps portingps propps # faqps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.nt ps cd $(THISDIR) -allpdfrtf: pdfrtf portingpdfrtf wxproppdfrtf # faqpdfrtf +allpdfrtf: pdfrtf portingpdfrtf proppdfrtf # faqpdfrtf cd $(WXDIR)\utils\dialoged\src nmake -f makefile.nt pdfrtf cd $(THISDIR) @@ -1550,12 +1419,12 @@ $(DOCDIR)/winhelp/faq.hlp: $(DOCDIR)/latex/faq/faq.rtf $(DOCDIR)/latex/f move faq.cnt $(DOCDIR)\winhelp\faq.cnt cd $(THISDIR) -$(DOCDIR)/winhelp/wxprop.hlp: $(DOCDIR)/latex/proplist/wxprop.rtf $(DOCDIR)/latex/proplist/wxprop.hpj +$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj cd $(DOCDIR)/latex/proplist - -erase wxprop.ph - hc wxprop - move wxprop.hlp $(DOCDIR)\winhelp\wxprop.hlp - move wxprop.cnt $(DOCDIR)\winhelp\wxprop.cnt + -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 @@ -1581,9 +1450,9 @@ $(DOCDIR)/latex/faq/faq.rtf: $(DOCDIR)/latex/faq/faq.tex -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/latex/faq/faq.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/proplist/wxprop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex +$(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 /w tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/wxprop.rtf -twice -winhelp + -start /w 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 @@ -1609,10 +1478,10 @@ $(DOCDIR)/pdf/faq.rtf: $(DOCDIR)/latex/faq/faq.tex -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/pdf/faq.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/wxprop.rtf: $(DOCDIR)/latex/proplist/proplist.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex +$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/proplist.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex cd $(DOCDIR)\latex\proplist -copy *.bmp *.wmf $(DOCDIR)\pdf - -start /w tex2rtf $(DOCDIR)/latex/proplist/wxprop.tex $(DOCDIR)/pdf/wxprop.rtf -twice -rtf + -start /w tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex @@ -1629,7 +1498,7 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex -erase $(DOCDIR)\html\wx\*.ref -erase $(DOCDIR)\latex\wx\*.con -erase $(DOCDIR)\latex\wx\*.ref - cd $(THISDIR) + cd $(THISDIR) $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex cd $(DOCDIR)\latex\porting @@ -1654,7 +1523,7 @@ $(DOCDIR)\html\faq\faq.htm: $(DOCDIR)\latex\faq\faq.tex $(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 /w tex2rtf $(DOCDIR)\latex\proplist\wxprop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html + -start /w 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 @@ -1734,3 +1603,4 @@ updatedocs: touchmanual alldocs # Office StartUp folder, and PDFMaker should be installed. updatepdf: # touchmanual pdfrtf start /w "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF" +