X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33b64e6f8b7cf372a569e61d7eee879217945043..4e938f5b0bffb7102fe4a3b2ba3baf7d5a067fb4:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 1d626d9204..337520e00f 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -25,10 +25,10 @@ LIBTARGET=$(WXLIB) DUMMYOBJ=$D\dummy.obj !endif -# Please set these according to the settings in wx_setup.h, so we can include +# 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 wx_setup.h +# This one overrides the others, to be consistent with the settings in setup.h MINIMAL_WXWINDOWS_SETUP=0 PERIPH_LIBS= @@ -70,6 +70,7 @@ GENERICOBJS= \ ..\generic\$D\gridg.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\panelg.obj \ + ..\generic\$D\progdlgg.obj \ ..\generic\$D\prop.obj \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ @@ -78,7 +79,9 @@ GENERICOBJS= \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ ..\generic\$D\tabg.obj \ - ..\generic\$D\textdlgg.obj + ..\generic\$D\textdlgg.obj \ + ..\generic\$D\extdlgg.obj \ + ..\generic\$D\tipdlg.obj # ..\generic\$D\imaglist.obj \ # ..\generic\$D\treectrl.obj \ @@ -98,6 +101,7 @@ NONESSENTIALOBJS= \ COMMONOBJS = \ ..\common\$D\cmndata.obj \ ..\common\$D\config.obj \ + ..\common\$D\dcbase.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ ..\common\$D\docview.obj \ @@ -112,6 +116,10 @@ COMMONOBJS = \ ..\common\$D\ftp.obj \ ..\common\$D\gdicmn.obj \ ..\common\$D\image.obj \ + ..\common\$D\imagbmp.obj \ + ..\common\$D\imagjpeg.obj \ + ..\common\$D\imagpng.obj \ + ..\common\$D\imaggif.obj \ ..\common\$D\intl.obj \ ..\common\$D\ipcbase.obj \ ..\common\$D\helpbase.obj \ @@ -135,9 +143,11 @@ COMMONOBJS = \ ..\common\$D\date.obj \ ..\common\$D\hash.obj \ ..\common\$D\list.obj \ + ..\common\$D\paper.obj \ ..\common\$D\string.obj \ ..\common\$D\socket.obj \ ..\common\$D\sckaddr.obj \ + ..\common\$D\sckint.obj \ ..\common\$D\sckfile.obj \ ..\common\$D\sckipc.obj \ ..\common\$D\sckstrm.obj \ @@ -157,7 +167,10 @@ COMMONOBJS = \ ..\common\$D\datstrm.obj \ ..\common\$D\objstrm.obj \ ..\common\$D\variant.obj \ - ..\common\$D\wincmn.obj + ..\common\$D\dlgcmn.obj \ + ..\common\$D\wincmn.obj \ + ..\common\$D\txtstrm.obj \ + ..\common\$D\wxchar.obj MSWOBJS = \ ..\msw\$D\accel.obj \ @@ -168,6 +181,7 @@ MSWOBJS = \ ..\msw\$D\button.obj \ ..\msw\$D\checkbox.obj \ ..\msw\$D\checklst.obj \ + ..\msw\$D\caret.obj \ ..\msw\$D\choice.obj \ ..\msw\$D\clipbrd.obj \ ..\msw\$D\colordlg.obj \ @@ -187,6 +201,7 @@ MSWOBJS = \ ..\msw\$D\dib.obj \ ..\msw\$D\dibutils.obj \ ..\msw\$D\dirdlg.obj \ + ..\msw\$D\dragimag.obj \ ..\msw\$D\filedlg.obj \ ..\msw\$D\font.obj \ ..\msw\$D\fontdlg.obj \ @@ -229,6 +244,7 @@ MSWOBJS = \ ..\msw\$D\spinbutt.obj \ ..\msw\$D\statbmp.obj \ ..\msw\$D\statbox.obj \ + ..\msw\$D\statline.obj \ ..\msw\$D\statbr95.obj \ ..\msw\$D\stattext.obj \ ..\msw\$D\tabctrl.obj \ @@ -256,9 +272,9 @@ MSWOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET) +all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D +dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D test: $(MSWDIR)\$D\wave.obj test2: ..\common\Debug\config.obj @@ -280,10 +296,10 @@ $(OLEDIR)\$D: # wxWindows library as DLL dll: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) cleandll: - nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 + nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) # wxWindows + app as DLL. Only affects main.cpp. dllapp: @@ -303,8 +319,8 @@ dllnp: # In fact headers are compiled differently depending on whether a DLL is being made # or an app is calling the DLL exported functionality (WXDLLEXPORT is different # in each case) so you couldn't use the same PCH. -pch: - nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) +pch: + nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME) pch1: dirs $(DUMMYOBJ) echo $(DUMMYOBJ) @@ -338,7 +354,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME). $(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 $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib + $(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\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib << !endif @@ -356,9 +372,14 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp << # If taking wxWindows from CVS, setup.h doesn't exist yet. -$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h - -copy "$(WXDIR)"\include\wx\msw\setup.h "$(WXDIR)"\include\wx\msw\setup.bak - if not exist "$(WXDIR)"\include\wx\msw\setup.h copy "$(WXDIR)"\include\wx\msw\setup0.h "$(WXDIR)"\include\wx\msw\setup.h +# 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\extended.obj: ..\common\extended.c cl @<< @@ -400,6 +421,16 @@ clean_zlib: nmake -f makefile.vc clean cd $(WXDIR)\src\msw +jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all + cd $(WXDIR)\src\msw + +clean_jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.vc clean + cd $(WXDIR)\src\msw + xpm: cd $(WXDIR)\src\xpm nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) @@ -415,7 +446,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm -erase $(LIBTARGET) -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase ..\..\lib\wx200.dll @@ -450,26 +481,22 @@ cleanall: clean # Making documents docs: allhlp allhtml allpdfrtf alldocs: docs -hlp: wxhlp portinghlp # faqhlp +hlp: wxhlp portinghlp wxhlp: $(DOCDIR)/winhelp/wx.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 proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -faqpdfrtf: $(DOCDIR)/pdf/faq.rtf proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf -html: wxhtml # faqhtml +html: wxhtml portinghtml wxhtml: $(DOCDIR)\html\wx\wx.htm -faqhtml: $(DOCDIR)\html\faq\faq.htm +htmlhelp: $(DOCDIR)\html\wx\wx.chm prophtml: $(DOCDIR)\html\proplist\prop.htm -ps: wxps referencps # faqps +ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps propps: $(WXDIR)\docs\ps\prop.ps -faqps: $(WXDIR)\docs\ps\faq.ps referencps: $(WXDIR)\docs\ps\referenc.ps portinghtml: $(DOCDIR)\html\porting\port.htm @@ -478,7 +505,7 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp portingpdfrtf: $(DOCDIR)/pdf/porting.rtf portingps: $(WXDIR)\docs\ps\porting.ps -allhlp: wxhlp portinghlp prop # faqhlp +allhlp: wxhlp portinghlp prophlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc hlp cd $(THISDIR) @@ -498,7 +525,7 @@ allhlp: wxhlp portinghlp prop # faqhlp # cd $(WXDIR)\utils\wxgrid\src # nmake -f makefile.vc hlp -allhtml: wxhtml portinghtml prophtml # faqhtml +allhtml: wxhtml portinghtml prophtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html cd $(THISDIR) @@ -519,12 +546,12 @@ allhtml: wxhtml portinghtml prophtml # faqhtml # cd $(WXDIR)\utils\wxtree\src # nmake -f makefile.vc html -allps: wxps referencps portingps propps # faqps +allps: wxps referencps portingps propps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc ps cd $(THISDIR) -allpdfrtf: pdfrtf portingpdfrtf proppdfrtf # faqpdfrtf +allpdfrtf: pdfrtf portingpdfrtf proppdfrtf cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc pdfrtf cd $(THISDIR) @@ -557,14 +584,6 @@ $(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOC move porting.cnt $(DOCDIR)\winhelp\porting.cnt cd $(THISDIR) -$(DOCDIR)/winhelp/faq.hlp: $(DOCDIR)/latex/faq/faq.rtf $(DOCDIR)/latex/faq/faq.hpj - cd $(DOCDIR)/latex/faq - -erase faq.ph - hc faq - move faq.hlp $(DOCDIR)\winhelp\faq.hlp - move faq.cnt $(DOCDIR)\winhelp\faq.cnt - cd $(THISDIR) - $(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj cd $(DOCDIR)/latex/proplist -erase prop.ph @@ -583,93 +602,78 @@ $(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOC $(DOCDIR)/latex/wx/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 - -start /w tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp cd $(THISDIR) $(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex cd $(DOCDIR)\latex\porting - -start /w tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp - cd $(THISDIR) - -$(DOCDIR)/latex/faq/faq.rtf: $(DOCDIR)/latex/faq/faq.tex - cd $(DOCDIR)\latex\faq - -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/latex/faq/faq.rtf -twice -winhelp + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp cd $(THISDIR) $(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/prop.rtf -twice -winhelp + -start $(WAITFLAG) 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 cd $(DOCDIR)\latex\techref - -start /w tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp cd $(THISDIR) $(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 -copy *.bmp *.wmf $(DOCDIR)\pdf - -start /w tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex cd $(DOCDIR)\latex\porting -copy *.bmp *.wmf $(DOCDIR)\pdf - -start /w tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/faq.rtf: $(DOCDIR)/latex/faq/faq.tex - cd $(DOCDIR)\latex\faq - -copy *.bmp *.wmf $(DOCDIR)\pdf - -start /w tex2rtf $(DOCDIR)/latex/faq/faq.tex $(DOCDIR)/pdf/faq.rtf -twice -rtf - cd $(THISDIR) - -$(DOCDIR)/pdf/prop.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/prop.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/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -copy *.bmp *.wmf $(DOCDIR)\pdf - -start /w tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf cd $(THISDIR) $(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 - -start /w tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html + -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 -erase $(DOCDIR)\latex\wx\*.con -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) +$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp + cd $(DOCDIR)\html\wx + -hhc wx.hhp + cd $(THISDIR) + + $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex cd $(DOCDIR)\latex\porting -mkdir $(DOCDIR)\html\porting - -start /w tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html -erase $(DOCDIR)\html\porting\*.con -erase $(DOCDIR)\html\porting\*.ref -erase $(DOCDIR)\latex\porting\*.con -erase $(DOCDIR)\latex\porting\*.ref cd $(THISDIR) -$(DOCDIR)\html\faq\faq.htm: $(DOCDIR)\latex\faq\faq.tex - cd $(DOCDIR)\latex\faq - -mkdir $(DOCDIR)\html\faq - -start /w tex2rtf $(DOCDIR)\latex\faq\faq.tex $(DOCDIR)\html\faq\faq.htm -twice -html - -erase $(DOCDIR)\html\faq\*.con - -erase $(DOCDIR)\html\faq\*.ref - -erase $(DOCDIR)\latex\faq\*.con - -erase $(DOCDIR)\latex\faq\*.ref - cd $(THISDIR) - $(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\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html + -start $(WAITFLAG) 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 @@ -724,21 +728,6 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi move referenc.ps $(WXDIR)\docs\ps\referenc.ps cd $(THISDIR) -$(WXDIR)\docs\latex\faq\faq.dvi: $(DOCDIR)/latex/faq/faq.tex - cd $(WXDIR)\docs\latex\faq - -latex faq - -latex faq - -makeindx faq - -latex faq - -latex faq - cd $(THISDIR) - -$(WXDIR)\docs\ps\faq.ps: $(WXDIR)\docs\latex\faq\faq.dvi - cd $(WXDIR)\docs\latex\faq - -dvips32 -o faq.ps faq - move faq.ps $(WXDIR)\docs\ps\faq.ps - cd $(THISDIR) - # In order to force document reprocessing touchmanual: -touch $(WXDIR)\docs\latex\wx\manual.tex @@ -748,5 +737,5 @@ updatedocs: touchmanual alldocs # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the # Office StartUp folder, and PDFMaker should be installed. updatepdf: # touchmanual pdfrtf - start /w "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF" + start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"