-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 14:24, 1999/11/15
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
$(CPPFLAGS) /Fo$@ /c /Tp $<
<<
+{..\msw}.c{..\msw\$D}.obj:
+ cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $<
GENERICOBJS= ..\generic\$D\busyinfo.obj \
..\generic\$D\choicdgg.obj \
- ..\generic\$D\extdlgg.obj \
- ..\generic\$D\gridg.obj \
+ ..\generic\$D\grid.obj \
..\generic\$D\laywin.obj \
+ ..\generic\$D\logg.obj \
..\generic\$D\numdlgg.obj \
..\generic\$D\panelg.obj \
..\generic\$D\progdlgg.obj \
..\generic\$D\statusbr.obj \
..\generic\$D\tabg.obj \
..\generic\$D\textdlgg.obj \
- ..\generic\$D\tipdlg.obj
+ ..\generic\$D\tipdlg.obj \
+ ..\generic\$D\wizard.obj
# These are generic things that don't need to be compiled on MSW,
# but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
+NONESSENTIALOBJS= ..\generic\$D\caret.obj \
+ ..\generic\$D\colrdlgg.obj \
+ ..\generic\$D\dcpsg.obj \
..\generic\$D\dirdlgg.obj \
+ ..\generic\$D\filedlgg.obj \
..\generic\$D\fontdlgg.obj \
+ ..\generic\$D\helpext.obj \
+ ..\generic\$D\helphtml.obj \
+ ..\generic\$D\helpwxht.obj \
..\generic\$D\helpxlp.obj \
..\generic\$D\imaglist.obj \
..\generic\$D\listctrl.obj \
..\generic\$D\notebook.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
+ ..\generic\$D\statline.obj \
..\generic\$D\treectrl.obj
COMMONOBJS = \
..\common\$D\y_tab.obj \
+ ..\common\$D\appcmn.obj \
..\common\$D\choiccmn.obj \
+ ..\common\$D\clipcmn.obj \
..\common\$D\cmndata.obj \
..\common\$D\config.obj \
..\common\$D\ctrlcmn.obj \
+ ..\common\$D\ctrlsub.obj \
..\common\$D\date.obj \
..\common\$D\datstrm.obj \
..\common\$D\db.obj \
..\common\$D\dbtable.obj \
..\common\$D\dcbase.obj \
..\common\$D\dlgcmn.obj \
+ ..\common\$D\dobjcmn.obj \
..\common\$D\docmdi.obj \
..\common\$D\docview.obj \
..\common\$D\dynarray.obj \
..\common\$D\fileconf.obj \
..\common\$D\filefn.obj \
..\common\$D\filesys.obj \
+ ..\common\$D\fontcmn.obj \
+ ..\common\$D\fontmap.obj \
..\common\$D\framecmn.obj \
..\common\$D\fs_inet.obj \
..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \
..\common\$D\gdicmn.obj \
+ ..\common\$D\gifdecod.obj \
..\common\$D\hash.obj \
..\common\$D\helpbase.obj \
..\common\$D\http.obj \
+ ..\common\$D\imagall.obj \
..\common\$D\imagbmp.obj \
..\common\$D\image.obj \
..\common\$D\imaggif.obj \
..\common\$D\imagjpeg.obj \
+ ..\common\$D\imagpcx.obj \
..\common\$D\imagpng.obj \
+ ..\common\$D\imagpnm.obj \
..\common\$D\intl.obj \
..\common\$D\ipcbase.obj \
..\common\$D\layout.obj \
+ ..\common\$D\lboxcmn.obj \
..\common\$D\list.obj \
..\common\$D\log.obj \
..\common\$D\memory.obj \
+ ..\common\$D\menucmn.obj \
..\common\$D\mimetype.obj \
..\common\$D\module.obj \
..\common\$D\mstream.obj \
..\common\$D\sckfile.obj \
..\common\$D\sckipc.obj \
..\common\$D\sckstrm.obj \
+ ..\common\$D\serbase.obj \
+ ..\common\$D\sizer.obj \
..\common\$D\socket.obj \
+ ..\common\$D\strconv.obj \
..\common\$D\stream.obj \
..\common\$D\string.obj \
..\common\$D\tbarbase.obj \
+ ..\common\$D\tbarsmpl.obj \
..\common\$D\textcmn.obj \
..\common\$D\textfile.obj \
..\common\$D\time.obj \
..\common\$D\wincmn.obj \
..\common\$D\wxchar.obj \
..\common\$D\wxexpr.obj \
- ..\common\$D\zipstream.obj \
+ ..\common\$D\zipstrm.obj \
..\common\$D\zstream.obj
MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\filedlg.obj \
..\msw\$D\font.obj \
..\msw\$D\fontdlg.obj \
+ ..\msw\$D\fontenum.obj \
+ ..\msw\$D\fontutil.obj \
..\msw\$D\frame.obj \
..\msw\$D\gauge95.obj \
..\msw\$D\gdiobj.obj \
+ ..\msw\$D\gsocket.obj \
..\msw\$D\helpwin.obj \
..\msw\$D\icon.obj \
..\msw\$D\imaglist.obj \
..\msw\$D\settings.obj \
..\msw\$D\slider95.obj \
..\msw\$D\spinbutt.obj \
+ ..\msw\$D\spinctrl.obj \
..\msw\$D\statbmp.obj \
..\msw\$D\statbox.obj \
..\msw\$D\statbr95.obj \
..\msw\$D\window.obj \
..\msw\$D\xpmhand.obj
-HTMLOBJS = \
- ..\html\$D\htmlcell.obj \
- ..\html\$D\htmlfilter.obj \
- ..\html\$D\htmlhelp.obj \
- ..\html\$D\htmlhelp_io.obj \
- ..\html\$D\htmlparser.obj \
- ..\html\$D\htmltag.obj \
- ..\html\$D\htmlwin.obj \
- ..\html\$D\htmlwinparser.obj \
- ..\html\$D\mod_fonts.obj \
- ..\html\$D\mod_hline.obj \
- ..\html\$D\mod_image.obj \
- ..\html\$D\mod_layout.obj \
- ..\html\$D\mod_links.obj \
- ..\html\$D\mod_list.obj \
- ..\html\$D\mod_pre.obj \
- ..\html\$D\mod_tables.obj \
- ..\html\$D\search.obj
+HTMLOBJS = ..\html\$D\helpctrl.obj \
+ ..\html\$D\helpdata.obj \
+ ..\html\$D\helpfrm.obj \
+ ..\html\$D\htmlcell.obj \
+ ..\html\$D\htmlfilt.obj \
+ ..\html\$D\htmlpars.obj \
+ ..\html\$D\htmltag.obj \
+ ..\html\$D\htmlwin.obj \
+ ..\html\$D\htmprint.obj \
+ ..\html\$D\m_fonts.obj \
+ ..\html\$D\m_hline.obj \
+ ..\html\$D\m_image.obj \
+ ..\html\$D\m_layout.obj \
+ ..\html\$D\m_links.obj \
+ ..\html\$D\m_list.obj \
+ ..\html\$D\m_pre.obj \
+ ..\html\$D\m_tables.obj \
+ ..\html\$D\winpars.obj
+
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
# Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
# Normal, static library
all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
<<
# Update the dynamic link library
-$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
$(link) @<<
$(LINKFLAGS)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
png:
cd $(WXDIR)\src\png
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_png:
zlib:
cd $(WXDIR)\src\zlib
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_zlib:
jpeg:
cd $(WXDIR)\src\jpeg
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
cd $(WXDIR)\src\msw
clean_jpeg:
xpm:
cd $(WXDIR)\src\xpm
- nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw
clean_xpm:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\src\msw
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg
-erase $(LIBTARGET)
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
- -erase ..\..\lib\wx200.dll
- -erase ..\..\lib\wx200.lib
- -erase ..\..\lib\wx200.exp
- -erase ..\..\lib\wx200.pdb
- -erase ..\..\lib\wx200.ilk
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
+ -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
-erase *.pdb
-erase *.sbr
-erase $(WXLIBNAME).pch
-erase $(OLEDIR)\$D\*.obj
-erase $(OLEDIR)\$D\*.sbr
-erase $(OLEDIR)\$D\*.pdb
+ -erase $(HTMLDIR)\$D\*.obj
+ -erase $(HTMLDIR)\$D\*.sbr
+ -erase $(HTMLDIR)\$D\*.pdb
-rmdir $(D)
-rmdir ole\$(D)
-rmdir ..\generic\$(D)
-rmdir ..\common\$(D)
+ -rmdir ..\html\$(D)
cleanall: clean
$(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
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-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
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-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
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-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
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
cd $(THISDIR)
projects / wxWidgets.git / blobdiff