X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..b12915c104de03c9fd5102404e35051e9b8609a8:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 7d9ab75738..fafb791651 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 18:37, 1999/10/22 +# This file was automatically generated by tmake at 02:45, 1999/12/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -98,7 +98,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\scrolwin.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ - ..\generic\$D\tabg.obj \ + ..\generic\$D\tbarsmpl.obj \ ..\generic\$D\textdlgg.obj \ ..\generic\$D\tipdlg.obj \ ..\generic\$D\wizard.obj @@ -122,6 +122,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \ ..\generic\$D\printps.obj \ ..\generic\$D\prntdlgg.obj \ ..\generic\$D\statline.obj \ + ..\generic\$D\tabg.obj \ ..\generic\$D\treectrl.obj COMMONOBJS = \ @@ -133,7 +134,7 @@ COMMONOBJS = \ ..\common\$D\config.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ - ..\common\$D\date.obj \ + ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ @@ -152,6 +153,7 @@ COMMONOBJS = \ ..\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 \ @@ -169,13 +171,16 @@ COMMONOBJS = \ ..\common\$D\imagpcx.obj \ ..\common\$D\imagpng.obj \ ..\common\$D\imagpnm.obj \ + ..\common\$D\imagtiff.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\longlong.obj \ ..\common\$D\memory.obj \ + ..\common\$D\menucmn.obj \ ..\common\$D\mimetype.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ @@ -198,10 +203,8 @@ COMMONOBJS = \ ..\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\timercmn.obj \ ..\common\$D\tokenzr.obj \ ..\common\$D\txtstrm.obj \ @@ -246,8 +249,10 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\dcscreen.obj \ ..\msw\$D\dde.obj \ ..\msw\$D\dialog.obj \ + ..\msw\$D\dialup.obj \ ..\msw\$D\dib.obj \ ..\msw\$D\dibutils.obj \ + ..\msw\$D\dir.obj \ ..\msw\$D\dirdlg.obj \ ..\msw\$D\dragimag.obj \ ..\msw\ole\$D\dropsrc.obj \ @@ -255,8 +260,11 @@ 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\gdiimage.obj \ ..\msw\$D\gdiobj.obj \ ..\msw\$D\gsocket.obj \ ..\msw\$D\helpwin.obj \ @@ -279,7 +287,6 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\palette.obj \ ..\msw\$D\pen.obj \ ..\msw\$D\penwin.obj \ - ..\msw\$D\pnghand.obj \ ..\msw\$D\printdlg.obj \ ..\msw\$D\printwin.obj \ ..\msw\$D\radiobox.obj \ @@ -321,6 +328,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ ..\html\$D\htmltag.obj \ ..\html\$D\htmlwin.obj \ ..\html\$D\htmprint.obj \ + ..\html\$D\m_dflist.obj \ ..\html\$D\m_fonts.obj \ ..\html\$D\m_hline.obj \ ..\html\$D\m_image.obj \ @@ -329,7 +337,6 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ ..\html\$D\m_list.obj \ ..\html\$D\m_pre.obj \ ..\html\$D\m_tables.obj \ - ..\html\$D\search.obj \ ..\html\$D\winpars.obj @@ -338,7 +345,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) +all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D @@ -424,7 +431,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(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 $(WXDIR)\lib\jpeg.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 $(WXDIR)\lib\tiff.lib << !endif @@ -501,6 +508,16 @@ clean_jpeg: nmake -f makefile.vc clean cd $(WXDIR)\src\msw +tiff: + cd $(WXDIR)\src\tiff + nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all + cd $(WXDIR)\src\msw + +clean_tiff: + cd $(WXDIR)\src\tiff + nmake -f makefile.vc clean + cd $(WXDIR)\src\msw + xpm: cd $(WXDIR)\src\xpm nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) @@ -516,7 +533,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff -erase $(LIBTARGET) -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll