X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83141d3a74bc3ce6b97632dec8b28b7569c480a2..1ec46a5b35233f3c69c5b73e4b0b36f44c650633:/src/msw/makefile.wat?ds=inline diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 2227c9090e..54eb3129e0 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 18:13, 2000/09/12 +# This file was automatically generated by tmake at 18:20, 2001/05/27 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -29,11 +29,10 @@ LIBTARGET = $(WXLIB)\wx.lib DUMMY=dummydll # ODBCLIB = ..\..\contrib\odbc\odbc32.lib -EXTRATARGETS = xpm png zlib jpeg tiff -EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff +EXTRATARGETS = png zlib jpeg tiff +EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff GENDIR=$(WXDIR)\src\generic COMMDIR=$(WXDIR)\src\common -XPMDIR=$(WXDIR)\src\xpm JPEGDIR=$(WXDIR)\src\jpeg TIFFDIR=$(WXDIR)\src\tiff MSWDIR=$(WXDIR)\src\msw @@ -47,12 +46,12 @@ GENERICOBJS= busyinfo.obj & dirctrlg.obj & dragimgg.obj & grid.obj & + gridctrl.obj & gridsel.obj & laywin.obj & logg.obj & numdlgg.obj & panelg.obj & - plot.obj & progdlgg.obj & prop.obj & propform.obj & @@ -86,6 +85,7 @@ NONESSENTIALOBJS= caret.obj & listctrl.obj & msgdlgg.obj & notebook.obj & + paletteg.obj & printps.obj & prntdlgg.obj & statline.obj & @@ -107,6 +107,7 @@ COMMONOBJS = & db.obj & dbtable.obj & dcbase.obj & + dircmn.obj & dlgcmn.obj & dndcmn.obj & dobjcmn.obj & @@ -122,6 +123,7 @@ COMMONOBJS = & file.obj & fileconf.obj & filefn.obj & + filename.obj & filesys.obj & fontcmn.obj & fontmap.obj & @@ -145,6 +147,7 @@ COMMONOBJS = & imagpng.obj & imagpnm.obj & imagtiff.obj & + imagxpm.obj & intl.obj & ipcbase.obj & layout.obj & @@ -152,6 +155,7 @@ COMMONOBJS = & list.obj & log.obj & longlong.obj & + matrix.obj & memory.obj & menucmn.obj & mimecmn.obj & @@ -194,6 +198,7 @@ COMMONOBJS = & wincmn.obj & wxchar.obj & wxexpr.obj & + xpmdecod.obj & zipstrm.obj & zstream.obj @@ -292,6 +297,7 @@ MSWOBJS = accel.obj & tbar95.obj & tbarmsw.obj & textctrl.obj & + tglbtn.obj & thread.obj & timer.obj & tooltip.obj & @@ -300,8 +306,7 @@ MSWOBJS = accel.obj & utilsexc.obj & uuid.obj & wave.obj & - window.obj & - xpmhand.obj + window.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) @@ -613,6 +618,9 @@ tbarmsw.obj: $(MSWDIR)\tbarmsw.cpp textctrl.obj: $(MSWDIR)\textctrl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +tglbtn.obj: $(MSWDIR)\tglbtn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + thread.obj: $(MSWDIR)\thread.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -640,9 +648,6 @@ wave.obj: $(MSWDIR)\wave.cpp window.obj: $(MSWDIR)\window.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -xpmhand.obj: $(MSWDIR)\xpmhand.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - ######################################################## @@ -690,6 +695,9 @@ dbtable.obj: $(COMMDIR)\dbtable.cpp dcbase.obj: $(COMMDIR)\dcbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dircmn.obj: $(COMMDIR)\dircmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -735,6 +743,9 @@ fileconf.obj: $(COMMDIR)\fileconf.cpp filefn.obj: $(COMMDIR)\filefn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +filename.obj: $(COMMDIR)\filename.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + filesys.obj: $(COMMDIR)\filesys.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -804,6 +815,9 @@ imagpnm.obj: $(COMMDIR)\imagpnm.cpp imagtiff.obj: $(COMMDIR)\imagtiff.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +imagxpm.obj: $(COMMDIR)\imagxpm.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + intl.obj: $(COMMDIR)\intl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -825,6 +839,9 @@ log.obj: $(COMMDIR)\log.cpp longlong.obj: $(COMMDIR)\longlong.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +matrix.obj: $(COMMDIR)\matrix.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + memory.obj: $(COMMDIR)\memory.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -951,6 +968,9 @@ wxchar.obj: $(COMMDIR)\wxchar.cpp wxexpr.obj: $(COMMDIR)\wxexpr.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +xpmdecod.obj: $(COMMDIR)\xpmdecod.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + zipstrm.obj: $(COMMDIR)\zipstrm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -992,6 +1012,9 @@ dragimgg.obj: $(GENDIR)\dragimgg.cpp grid.obj: $(GENDIR)\grid.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +gridctrl.obj: $(GENDIR)\gridctrl.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + gridsel.obj: $(GENDIR)\gridsel.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1007,9 +1030,6 @@ numdlgg.obj: $(GENDIR)\numdlgg.cpp panelg.obj: $(GENDIR)\panelg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -plot.obj: $(GENDIR)\plot.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - progdlgg.obj: $(GENDIR)\progdlgg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1060,73 +1080,6 @@ wizard.obj: $(GENDIR)\wizard.cpp -crbuffri.obj: $(XPMDIR)\crbuffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crbuffrp.obj: $(XPMDIR)\crbuffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crdatfri.obj: $(XPMDIR)\crdatfri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crdatfrp.obj: $(XPMDIR)\crdatfrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -create.obj: $(XPMDIR)\create.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crifrbuf.obj: $(XPMDIR)\crifrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crifrdat.obj: $(XPMDIR)\crifrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -crpfrdat.obj: $(XPMDIR)\crpfrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -# TODO: what to do about this clash of filename???? -#data.obj: $(XPMDIR)\data.c -# *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -hashtab.obj: $(XPMDIR)\hashtab.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -misc.obj: $(XPMDIR)\misc.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -parse.obj: $(XPMDIR)\parse.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -rdftodat.obj: $(XPMDIR)\rdftodat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -rdftoi.obj: $(XPMDIR)\rdftoi.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -rdftop.obj: $(XPMDIR)\rdftop.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -rgb.obj: $(XPMDIR)\rgb.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -scan.obj: $(XPMDIR)\scan.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -simx.obj: $(XPMDIR)\simx.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -wrffrdat.obj: $(XPMDIR)\wrffrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -wrffri.obj: $(XPMDIR)\wrffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - -wrffrp.obj: $(XPMDIR)\wrffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< - OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ trees$(O) OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ @@ -1176,16 +1129,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h zutil.obj: zutil.c zutil.h zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c -xpm: .SYMBOLIC - cd $(WXDIR)\src\xpm - wmake -f makefile.wat all - cd $(WXDIR)\src\msw - -clean_xpm: .SYMBOLIC - cd $(WXDIR)\src\xpm - wmake -f makefile.wat clean - cd $(WXDIR)\src\msw - png: .SYMBOLIC cd $(WXDIR)\src\png wmake -f makefile.wat all