X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/176e7e8321b9678afc493b51a62525af8ad52469..336b8a4257b2723804ed6aa5a033e86b7edb8dad:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 1175e5f50b..448b94cbfd 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 12:46, 2001/10/30 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -21,10 +21,8 @@ THISDIR=$(WXWIN)\src\msw !if "$(WXMAKINGDLL)" == "1" LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll -DUMMYOBJ=$D\dummydll.obj !else LIBTARGET=$(WXLIB) -DUMMYOBJ=$D\dummy.obj !endif # This one overrides the others, to be consistent with the settings in setup.h @@ -37,7 +35,7 @@ PERIPH_CLEAN_TARGET= # Set to 0 if not using GLCanvas (only affects DLL build) USE_GLCANVAS=1 -# Set to 0 if you are using MSVC 5 +# Set to 1 if you are using MSVC 5 USE_MSVC_5=0 # These are absolute paths, so that the compiler @@ -93,6 +91,8 @@ $(CPPFLAGS) /Fo$@ /c /Tp $< GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\calctrl.obj \ $(GENDIR)\$D\choicdgg.obj \ + $(GENDIR)\$D\dcbuffer.obj \ + $(GENDIR)\$D\dcpsg.obj \ $(GENDIR)\$D\dirctrlg.obj \ $(GENDIR)\$D\dragimgg.obj \ $(GENDIR)\$D\grid.obj \ @@ -124,12 +124,13 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ # but sometimes it's useful to do so for testing purposes. NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\dirdlgg.obj \ + $(GENDIR)\$D\filedlgg.obj \ $(GENDIR)\$D\fontdlgg.obj \ $(GENDIR)\$D\helpext.obj \ $(GENDIR)\$D\helphtml.obj \ - $(GENDIR)\$D\helpwxht.obj \ $(GENDIR)\$D\imaglist.obj \ $(GENDIR)\$D\listctrl.obj \ + $(GENDIR)\$D\mdig.obj \ $(GENDIR)\$D\msgdlgg.obj \ $(GENDIR)\$D\notebook.obj \ $(GENDIR)\$D\tabg.obj @@ -137,6 +138,8 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ COMMONOBJS = \ $(COMMDIR)\$D\y_tab.obj \ $(COMMDIR)\$D\appcmn.obj \ + $(COMMDIR)\$D\artprov.obj \ + $(COMMDIR)\$D\artstd.obj \ $(COMMDIR)\$D\choiccmn.obj \ $(COMMDIR)\$D\clipcmn.obj \ $(COMMDIR)\$D\clntdata.obj \ @@ -160,8 +163,10 @@ COMMONOBJS = \ $(COMMDIR)\$D\dobjcmn.obj \ $(COMMDIR)\$D\docmdi.obj \ $(COMMDIR)\$D\docview.obj \ + $(COMMDIR)\$D\dseldlg.obj \ $(COMMDIR)\$D\dynarray.obj \ $(COMMDIR)\$D\dynlib.obj \ + $(COMMDIR)\$D\dynload.obj \ $(COMMDIR)\$D\effects.obj \ $(COMMDIR)\$D\encconv.obj \ $(COMMDIR)\$D\event.obj \ @@ -185,12 +190,16 @@ COMMONOBJS = \ $(COMMDIR)\$D\geometry.obj \ $(COMMDIR)\$D\gifdecod.obj \ $(COMMDIR)\$D\hash.obj \ + $(COMMDIR)\$D\hashmap.obj \ $(COMMDIR)\$D\helpbase.obj \ $(COMMDIR)\$D\http.obj \ + $(COMMDIR)\$D\iconbndl.obj \ $(COMMDIR)\$D\imagall.obj \ $(COMMDIR)\$D\imagbmp.obj \ $(COMMDIR)\$D\image.obj \ + $(COMMDIR)\$D\imagfill.obj \ $(COMMDIR)\$D\imaggif.obj \ + $(COMMDIR)\$D\imagiff.obj \ $(COMMDIR)\$D\imagjpeg.obj \ $(COMMDIR)\$D\imagpcx.obj \ $(COMMDIR)\$D\imagpng.obj \ @@ -209,10 +218,10 @@ COMMONOBJS = \ $(COMMDIR)\$D\menucmn.obj \ $(COMMDIR)\$D\mimecmn.obj \ $(COMMDIR)\$D\module.obj \ + $(COMMDIR)\$D\msgout.obj \ $(COMMDIR)\$D\mstream.obj \ $(COMMDIR)\$D\nbkbase.obj \ $(COMMDIR)\$D\object.obj \ - $(COMMDIR)\$D\objstrm.obj \ $(COMMDIR)\$D\odbc.obj \ $(COMMDIR)\$D\paper.obj \ $(COMMDIR)\$D\popupcmn.obj \ @@ -227,7 +236,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\sckfile.obj \ $(COMMDIR)\$D\sckipc.obj \ $(COMMDIR)\$D\sckstrm.obj \ - $(COMMDIR)\$D\serbase.obj \ + $(COMMDIR)\$D\settcmn.obj \ $(COMMDIR)\$D\sizer.obj \ $(COMMDIR)\$D\socket.obj \ $(COMMDIR)\$D\statbar.obj \ @@ -236,6 +245,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\string.obj \ $(COMMDIR)\$D\sysopt.obj \ $(COMMDIR)\$D\tbarbase.obj \ + $(COMMDIR)\$D\textbuf.obj \ $(COMMDIR)\$D\textcmn.obj \ $(COMMDIR)\$D\textfile.obj \ $(COMMDIR)\$D\timercmn.obj \ @@ -313,6 +323,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\helpwin.obj \ $(MSWDIR)\$D\icon.obj \ $(MSWDIR)\$D\imaglist.obj \ + $(MSWDIR)\$D\iniconf.obj \ $(MSWDIR)\$D\joystick.obj \ $(MSWDIR)\$D\listbox.obj \ $(MSWDIR)\$D\listctrl.obj \ @@ -324,6 +335,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\mimetype.obj \ $(MSWDIR)\$D\minifram.obj \ $(MSWDIR)\$D\msgdlg.obj \ + $(MSWDIR)\$D\mslu.obj \ $(MSWDIR)\$D\nativdlg.obj \ $(MSWDIR)\$D\notebook.obj \ $(OLEDIR)\$D\oleutils.obj \ @@ -331,6 +343,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\palette.obj \ $(MSWDIR)\$D\pen.obj \ $(MSWDIR)\$D\penwin.obj \ + $(MSWDIR)\$D\popupwin.obj \ $(MSWDIR)\$D\printdlg.obj \ $(MSWDIR)\$D\printwin.obj \ $(MSWDIR)\$D\radiobox.obj \ @@ -362,6 +375,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\utils.obj \ $(MSWDIR)\$D\utilsexc.obj \ $(OLEDIR)\$D\uuid.obj \ + $(MSWDIR)\$D\volume.obj \ $(MSWDIR)\$D\wave.obj \ $(MSWDIR)\$D\window.obj @@ -381,8 +395,8 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \ $(HTMLDIR)\$D\m_layout.obj \ $(HTMLDIR)\$D\m_links.obj \ $(HTMLDIR)\$D\m_list.obj \ - $(HTMLDIR)\$D\m_meta.obj \ $(HTMLDIR)\$D\m_pre.obj \ + $(HTMLDIR)\$D\m_style.obj \ $(HTMLDIR)\$D\m_tables.obj \ $(HTMLDIR)\$D\winpars.obj @@ -392,7 +406,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT) -SETUP_H=$(ARCHINCDIR)\wx\setup.h +SETUP_H=$(ARCHINCDIR)\wx\setup.h # Normal, static library all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET) @@ -401,10 +415,15 @@ $(ARCHINCDIR)\wx: mkdir $(ARCHINCDIR) mkdir $(ARCHINCDIR)\wx -$(SETUP_H): +$(WXDIR)\include\wx\msw\setup.h: + cd $(WXDIR)\include\wx\msw + if not exist setup.h copy setup0.h setup.h + cd $(WXDIR)\src\msw + +$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup.h $@ -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx +dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D $D: mkdir $D @@ -433,20 +452,24 @@ $(TIFFDIR)\$D: $(REGEXDIR)\$D: mkdir $(REGEXDIR)\$D +$(WXDIR)\$D: + mkdir $(WXDIR)\$D + + # wxWindows library as DLL dll: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU) cleandll: - nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) + nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU) # wxWindows + app as DLL. Only affects main.cpp. dllapp: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU) # wxWindows + app as DLL, for Netscape plugin - remove DllMain. dllnp: - nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) + nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU) # Use this to make dummy.obj and generate a PCH. # You might use the dll target, then the pch target, in order to @@ -468,12 +491,12 @@ pch1: dirs $(DUMMYOBJ) ### Static library -$(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS) +$(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_LIBS) -erase $(LIBTARGET) $(implib) @<< -out:$@ -machine:$(CPU) -$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS) +$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS) << !else @@ -512,7 +535,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) $(INCREMENTAL) -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\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) + $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.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 $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) << !endif @@ -522,13 +545,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) ######################################################## # Windows-specific objects -$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) - cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp - -$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) - cl @<< -$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp -<< +$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) + cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp # Compile certain files with no optimization (some files cause a # compiler crash for buggy versions of VC++, e.g. 4.0). @@ -684,6 +702,9 @@ clean: $(PERIPH_CLEAN_TARGET) -erase *.pdb -erase *.sbr -erase $(WXLIBNAME).pch + -erase $(WXDIR)\$D\$(PCH) + -erase $(WXDIR)\$D\*.pdb + -erase $(WXDIR)\$D\*.obj -erase $(GENDIR)\$D\*.obj -erase $(GENDIR)\$D\*.pdb -erase $(GENDIR)\$D\*.sbr @@ -718,29 +739,29 @@ clean: $(PERIPH_CLEAN_TARGET) -rmdir $(HTMLDIR)\$(D) -rmdir $(JPEGDIR)\$(D) -rmdir $(TIFFDIR)\$(D) + -rmdir $(WXDIR)\$D # Making documents docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp alldocs: docs hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml htb: $(DOCDIR)\htb\wx.htb wxhtml: $(DOCDIR)\html\wx\wx.htm htmlhelp: $(DOCDIR)\htmlhelp\wx.chm -ps: wxps referencps +ps: wxps wxps: $(WXDIR)\docs\ps\wx.ps -referencps: $(WXDIR)\docs\ps\referenc.ps allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc hlp cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc hlp + cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc hlp cd $(THISDIR) allhtml: wxhtml @@ -748,6 +769,7 @@ allhtml: wxhtml nmake -f makefile.vc html cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc html + cd $(WXDIR)\contrib\src\fl cd $(THISDIR) allhtmlhelp: htmlhelp @@ -755,6 +777,8 @@ allhtmlhelp: htmlhelp nmake -f makefile.vc htmlhelp cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc htmlhelp + cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc htmlhelp cd $(THISDIR) allhtb: htb @@ -762,6 +786,8 @@ allhtb: htb nmake -f makefile.vc htb cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc htb + cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc htb cd $(THISDIR) allps: wxps referencps @@ -769,6 +795,8 @@ allps: wxps referencps nmake -f makefile.vc ps cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc ps + cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc ps cd $(THISDIR) allpdfrtf: pdfrtf @@ -776,6 +804,8 @@ allpdfrtf: pdfrtf nmake -f makefile.vc pdfrtf cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc pdfrtf + cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc pdfrtf cd $(THISDIR) $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj @@ -788,24 +818,11 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w move wx.cnt $(DOCDIR)\winhelp\wx.cnt cd $(THISDIR) -$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj - cd $(DOCDIR)/latex/techref - -erase techref.ph - hc techref - move techref.hlp $(DOCDIR)\winhelp\techref.hlp - move techref.cnt $(DOCDIR)\winhelp\techref.cnt - cd $(THISDIR) - $(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 $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex - cd $(DOCDIR)\latex\techref - -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 *.wmf $(DOCDIR)\pdf @@ -813,26 +830,26 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex - cd $(DOCDIR)\latex\techref - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf - cd $(THISDIR) - +# This target does two sets of HTML: one using a style sheet, for +# the purposes of the CHM file, and one without. $(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 copy *.gif $(DOCDIR)\html\wx -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html + -mkdir $(DOCDIR)\mshtml + -mkdir $(DOCDIR)\mshtml\wx + copy *.gif $(DOCDIR)\mshtml\wx + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini -erase $(DOCDIR)\html\wx\*.con -erase $(DOCDIR)\html\wx\*.ref -erase $(DOCDIR)\latex\wx\*.con -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) -$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp - cd $(DOCDIR)\html\wx +$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp + cd $(DOCDIR)\mshtml\wx + copy $(DOCDIR)\latex\wx\wx.css . -hhc wx.hhp -mkdir ..\..\htmlhelp -erase $(DOCDIR)\htmlhelp\wx.chm