X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c41a418df66b66711eba536526a3085f690782e..794005c0acc80bf21ca0ed2e1f42f1d78947957b:/src/msw/makefile.vc?ds=sidebyside diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 84e6b7303a..fc14bdcec3 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -142,6 +142,7 @@ COMMONOBJS = \ ..\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 \ @@ -161,7 +162,8 @@ COMMONOBJS = \ ..\common\$D\datstrm.obj \ ..\common\$D\objstrm.obj \ ..\common\$D\variant.obj \ - ..\common\$D\wincmn.obj + ..\common\$D\wincmn.obj \ + ..\common\$D\wxchar.obj MSWOBJS = \ ..\msw\$D\accel.obj \ @@ -172,6 +174,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 \ @@ -261,9 +264,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 @@ -285,10 +288,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: @@ -308,8 +311,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) @@ -410,6 +413,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) @@ -425,7 +438,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 @@ -580,52 +593,52 @@ $(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 + -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/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 @@ -635,7 +648,7 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex $(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 @@ -645,7 +658,7 @@ $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.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\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 @@ -709,5 +722,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"