X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66e23ad2081689dad6e829b9667cdbc93ac45154..cc7343106df962079f7b8eaaefbc0514428d3f2a:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index f940d3b6aa..889657ffd3 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 00:44, 2001/05/09 +# This file was automatically generated by tmake at 18:07, 2001/07/04 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -47,6 +47,8 @@ OLEDIR=ole MSWDIR=$(WXDIR)\src\msw DOCDIR = $(WXDIR)\docs HTMLDIR = $(WXDIR)\src\html +JPEGDIR = $(WXDIR)\src\jpeg +TIFFDIR = $(WXDIR)\src\tiff {..\generic}.cpp{..\generic\$D}.obj: cl @<< @@ -89,6 +91,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ ..\generic\$D\grid.obj \ + ..\generic\$D\gridctrl.obj \ ..\generic\$D\gridsel.obj \ ..\generic\$D\laywin.obj \ ..\generic\$D\logg.obj \ @@ -99,7 +102,8 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrolwin.obj \ + ..\generic\$D\scrlwing.obj \ + ..\generic\$D\spinctlg.obj \ ..\generic\$D\splash.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ @@ -113,11 +117,8 @@ GENERICOBJS= ..\generic\$D\busyinfo.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\caret.obj \ - ..\generic\$D\colrdlgg.obj \ - ..\generic\$D\dcpsg.obj \ +NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dirdlgg.obj \ - ..\generic\$D\filedlgg.obj \ ..\generic\$D\fontdlgg.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ @@ -127,10 +128,6 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \ ..\generic\$D\listctrl.obj \ ..\generic\$D\msgdlgg.obj \ ..\generic\$D\notebook.obj \ - ..\generic\$D\paletteg.obj \ - ..\generic\$D\printps.obj \ - ..\generic\$D\prntdlgg.obj \ - ..\generic\$D\statline.obj \ ..\generic\$D\tabg.obj COMMONOBJS = \ @@ -139,6 +136,7 @@ COMMONOBJS = \ ..\common\$D\choiccmn.obj \ ..\common\$D\clipcmn.obj \ ..\common\$D\cmdline.obj \ + ..\common\$D\cmdproc.obj \ ..\common\$D\cmndata.obj \ ..\common\$D\config.obj \ ..\common\$D\cshelp.obj \ @@ -147,8 +145,10 @@ COMMONOBJS = \ ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ + ..\common\$D\dbgrid.obj \ ..\common\$D\dbtable.obj \ ..\common\$D\dcbase.obj \ + ..\common\$D\dircmn.obj \ ..\common\$D\dlgcmn.obj \ ..\common\$D\dndcmn.obj \ ..\common\$D\dobjcmn.obj \ @@ -173,6 +173,7 @@ COMMONOBJS = \ ..\common\$D\fs_mem.obj \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ + ..\common\$D\gaugecmn.obj \ ..\common\$D\gdicmn.obj \ ..\common\$D\geometry.obj \ ..\common\$D\gifdecod.obj \ @@ -202,14 +203,17 @@ COMMONOBJS = \ ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ + ..\common\$D\nbkbase.obj \ ..\common\$D\object.obj \ ..\common\$D\objstrm.obj \ ..\common\$D\odbc.obj \ ..\common\$D\paper.obj \ + ..\common\$D\popupcmn.obj \ ..\common\$D\prntbase.obj \ ..\common\$D\process.obj \ ..\common\$D\protocol.obj \ ..\common\$D\quantize.obj \ + ..\common\$D\radiocmn.obj \ ..\common\$D\resource.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ @@ -323,6 +327,7 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\scrolbar.obj \ ..\msw\$D\settings.obj \ ..\msw\$D\slider95.obj \ + ..\msw\$D\snglinst.obj \ ..\msw\$D\spinbutt.obj \ ..\msw\$D\spinctrl.obj \ ..\msw\$D\statbmp.obj \ @@ -379,7 +384,7 @@ setuph: if not exist setup.h copy setup0.h setup.h cd $(WXDIR)\src\msw -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D +dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $D: mkdir $D @@ -399,6 +404,12 @@ $(OLEDIR)\$D: $(HTMLDIR)\$D: mkdir $(HTMLDIR)\$D +$(JPEGDIR)\$D: + mkdir $(JPEGDIR)\$D + +$(TIFFDIR)\$D: + mkdir $(TIFFDIR)\$D + # wxWindows library as DLL dll: nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) @@ -464,11 +475,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\$(WXLIBNAME).dll -<<<<<<< vc.t - $(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 -======= $(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 ->>>>>>> 1.32 delayimp.lib /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll @@ -645,17 +652,29 @@ clean: $(PERIPH_CLEAN_TARGET) -erase $(MSWDIR)\$D\*.obj -erase $(MSWDIR)\$D\*.sbr -erase $(MSWDIR)\$D\*.pdb + -erase $(MSWDIR)\$D\*.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 + -erase $(JPEGDIR)\$D\*.obj + -erase $(JPEGDIR)\$D\*.sbr + -erase $(JPEGDIR)\$D\*.idb + -erase $(JPEGDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.obj + -erase $(TIFFDIR)\$D\*.sbr + -erase $(TIFFDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.idb -rmdir $(D) - -rmdir ole\$(D) - -rmdir ..\generic\$(D) - -rmdir ..\common\$(D) - -rmdir ..\html\$(D) + -rmdir $(GENDIR)\$(D) + -rmdir $(COMMDIR)\$(D) + -rmdir $(MSWDIR)\$(D) + -rmdir $(OLEDIR)\$(D) + -rmdir $(HTMLDIR)\$(D) + -rmdir $(JPEGDIR)\$(D) + -rmdir $(TIFFDIR)\$(D) # Making documents docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp