X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d0512bd8f4bdf548e0385b21f54f14b68b4b174..9c904e251a8ba31afe28a39d7448fbab491604c9:/src/msw/makefile.wat?ds=sidebyside
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index e3e852359b..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 13:22, 1999/11/24
+# 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,19 +29,25 @@ LIBTARGET = $(WXLIB)\wx.lib
DUMMY=dummydll
# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+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
OLEDIR=$(MSWDIR)\ole
DOCDIR = $(WXDIR)\docs
GENERICOBJS= busyinfo.obj &
+ calctrl.obj &
choicdgg.obj &
+ dirctrlg.obj &
+ dragimgg.obj &
grid.obj &
+ gridctrl.obj &
+ gridsel.obj &
laywin.obj &
logg.obj &
numdlgg.obj &
@@ -52,11 +58,15 @@ GENERICOBJS= busyinfo.obj &
proplist.obj &
sashwin.obj &
scrolwin.obj &
+ splash.obj &
splitter.obj &
statusbr.obj &
- tabg.obj &
+ tbarsmpl.obj &
textdlgg.obj &
tipdlg.obj &
+ tipwin.obj &
+ treectlg.obj &
+ treelay.obj &
wizard.obj
# These are generic things that don't need to be compiled on MSW,
@@ -75,45 +85,55 @@ NONESSENTIALOBJS= caret.obj &
listctrl.obj &
msgdlgg.obj &
notebook.obj &
+ paletteg.obj &
printps.obj &
prntdlgg.obj &
statline.obj &
- treectrl.obj
+ tabg.obj
COMMONOBJS = &
y_tab.obj &
appcmn.obj &
choiccmn.obj &
clipcmn.obj &
+ cmdline.obj &
cmndata.obj &
config.obj &
+ cshelp.obj &
ctrlcmn.obj &
ctrlsub.obj &
- date.obj &
+ datetime.obj &
datstrm.obj &
db.obj &
dbtable.obj &
dcbase.obj &
+ dircmn.obj &
dlgcmn.obj &
+ dndcmn.obj &
dobjcmn.obj &
docmdi.obj &
docview.obj &
dynarray.obj &
dynlib.obj &
+ effects.obj &
+ encconv.obj &
event.obj &
extended.obj &
ffile.obj &
file.obj &
fileconf.obj &
filefn.obj &
+ filename.obj &
filesys.obj &
fontcmn.obj &
fontmap.obj &
framecmn.obj &
fs_inet.obj &
+ fs_mem.obj &
fs_zip.obj &
ftp.obj &
gdicmn.obj &
+ geometry.obj &
gifdecod.obj &
hash.obj &
helpbase.obj &
@@ -122,18 +142,23 @@ COMMONOBJS = &
imagbmp.obj &
image.obj &
imaggif.obj &
+ imagjpeg.obj &
imagpcx.obj &
imagpng.obj &
imagpnm.obj &
+ imagtiff.obj &
+ imagxpm.obj &
intl.obj &
ipcbase.obj &
layout.obj &
lboxcmn.obj &
list.obj &
log.obj &
+ longlong.obj &
+ matrix.obj &
memory.obj &
menucmn.obj &
- mimetype.obj &
+ mimecmn.obj &
module.obj &
mstream.obj &
object.obj &
@@ -143,6 +168,7 @@ COMMONOBJS = &
prntbase.obj &
process.obj &
protocol.obj &
+ quantize.obj &
resource.obj &
sckaddr.obj &
sckfile.obj &
@@ -155,12 +181,11 @@ COMMONOBJS = &
stream.obj &
string.obj &
tbarbase.obj &
- tbarsmpl.obj &
textcmn.obj &
textfile.obj &
- time.obj &
timercmn.obj &
tokenzr.obj &
+ treebase.obj &
txtstrm.obj &
unzip.obj &
url.obj &
@@ -173,6 +198,7 @@ COMMONOBJS = &
wincmn.obj &
wxchar.obj &
wxexpr.obj &
+ xpmdecod.obj &
zipstrm.obj &
zstream.obj
@@ -203,12 +229,15 @@ MSWOBJS = accel.obj &
dcscreen.obj &
dde.obj &
dialog.obj &
+ dialup.obj &
dib.obj &
dibutils.obj &
+ dir.obj &
dirdlg.obj &
dragimag.obj &
dropsrc.obj &
droptgt.obj &
+ enhmeta.obj &
filedlg.obj &
font.obj &
fontdlg.obj &
@@ -219,7 +248,10 @@ MSWOBJS = accel.obj &
gaugemsw.obj &
gdiimage.obj &
gdiobj.obj &
+ glcanvas.obj &
gsocket.obj &
+ gsockmsw.obj &
+ helpchm.obj &
helpwin.obj &
icon.obj &
imaglist.obj &
@@ -232,6 +264,7 @@ MSWOBJS = accel.obj &
menu.obj &
menuitem.obj &
metafile.obj &
+ mimetype.obj &
minifram.obj &
msgdlg.obj &
nativdlg.obj &
@@ -264,6 +297,7 @@ MSWOBJS = accel.obj &
tbar95.obj &
tbarmsw.obj &
textctrl.obj &
+ tglbtn.obj &
thread.obj &
timer.obj &
tooltip.obj &
@@ -272,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)
@@ -381,12 +414,18 @@ dde.obj: $(MSWDIR)\dde.cpp
dialog.obj: $(MSWDIR)\dialog.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dialup.obj: $(MSWDIR)\dialup.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
dib.obj: $(MSWDIR)\dib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dibutils.obj: $(MSWDIR)\dibutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dir.obj: $(MSWDIR)\dir.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
dirdlg.obj: $(MSWDIR)\dirdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -399,6 +438,9 @@ dropsrc.obj: $(OLEDIR)\dropsrc.cpp
droptgt.obj: $(OLEDIR)\droptgt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+enhmeta.obj: $(MSWDIR)\enhmeta.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
filedlg.obj: $(MSWDIR)\filedlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -429,9 +471,18 @@ gdiimage.obj: $(MSWDIR)\gdiimage.cpp
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+glcanvas.obj: $(MSWDIR)\glcanvas.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
gsocket.obj: $(MSWDIR)\gsocket.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
+gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+ *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpchm.obj: $(MSWDIR)\helpchm.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
helpwin.obj: $(MSWDIR)\helpwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -468,6 +519,9 @@ menuitem.obj: $(MSWDIR)\menuitem.cpp
metafile.obj: $(MSWDIR)\metafile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+mimetype.obj: $(MSWDIR)\mimetype.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
minifram.obj: $(MSWDIR)\minifram.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -564,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) $<
@@ -591,9 +648,6 @@ wave.obj: $(MSWDIR)\wave.cpp
window.obj: $(MSWDIR)\window.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-xpmhand.obj: $(MSWDIR)\xpmhand.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
########################################################
@@ -608,19 +662,25 @@ choiccmn.obj: $(COMMDIR)\choiccmn.cpp
clipcmn.obj: $(COMMDIR)\clipcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+cmdline.obj: $(COMMDIR)\cmdline.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
cmndata.obj: $(COMMDIR)\cmndata.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
config.obj: $(COMMDIR)\config.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+cshelp.obj: $(COMMDIR)\cshelp.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-date.obj: $(COMMDIR)\date.cpp
+datetime.obj: $(COMMDIR)\datetime.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
datstrm.obj: $(COMMDIR)\datstrm.cpp
@@ -635,9 +695,15 @@ 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) $<
+dndcmn.obj: $(COMMDIR)\dndcmn.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
dobjcmn.obj: $(COMMDIR)\dobjcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -653,6 +719,12 @@ dynarray.obj: $(COMMDIR)\dynarray.cpp
dynlib.obj: $(COMMDIR)\dynlib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+effects.obj: $(COMMDIR)\effects.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+encconv.obj: $(COMMDIR)\encconv.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
event.obj: $(COMMDIR)\event.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -671,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) $<
@@ -686,6 +761,9 @@ framecmn.obj: $(COMMDIR)\framecmn.cpp
fs_inet.obj: $(COMMDIR)\fs_inet.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+fs_mem.obj: $(COMMDIR)\fs_mem.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
fs_zip.obj: $(COMMDIR)\fs_zip.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -695,6 +773,9 @@ ftp.obj: $(COMMDIR)\ftp.cpp
gdicmn.obj: $(COMMDIR)\gdicmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+geometry.obj: $(COMMDIR)\geometry.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
gifdecod.obj: $(COMMDIR)\gifdecod.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -719,6 +800,9 @@ image.obj: $(COMMDIR)\image.cpp
imaggif.obj: $(COMMDIR)\imaggif.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
imagpcx.obj: $(COMMDIR)\imagpcx.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -728,6 +812,12 @@ imagpng.obj: $(COMMDIR)\imagpng.cpp
imagpnm.obj: $(COMMDIR)\imagpnm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagtiff.obj: $(COMMDIR)\imagtiff.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagxpm.obj: $(COMMDIR)\imagxpm.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
intl.obj: $(COMMDIR)\intl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -746,13 +836,19 @@ list.obj: $(COMMDIR)\list.cpp
log.obj: $(COMMDIR)\log.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+longlong.obj: $(COMMDIR)\longlong.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+matrix.obj: $(COMMDIR)\matrix.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
memory.obj: $(COMMDIR)\memory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
menucmn.obj: $(COMMDIR)\menucmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-mimetype.obj: $(COMMDIR)\mimetype.cpp
+mimecmn.obj: $(COMMDIR)\mimecmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
module.obj: $(COMMDIR)\module.cpp
@@ -782,6 +878,9 @@ process.obj: $(COMMDIR)\process.cpp
protocol.obj: $(COMMDIR)\protocol.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+quantize.obj: $(COMMDIR)\quantize.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
resource.obj: $(COMMDIR)\resource.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -818,24 +917,21 @@ string.obj: $(COMMDIR)\string.cpp
tbarbase.obj: $(COMMDIR)\tbarbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-tbarsmpl.obj: $(COMMDIR)\tbarsmpl.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
textcmn.obj: $(COMMDIR)\textcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textfile.obj: $(COMMDIR)\textfile.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-time.obj: $(COMMDIR)\time.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
timercmn.obj: $(COMMDIR)\timercmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tokenzr.obj: $(COMMDIR)\tokenzr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+treebase.obj: $(COMMDIR)\treebase.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
txtstrm.obj: $(COMMDIR)\txtstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -872,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) $<
@@ -898,12 +997,27 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
busyinfo.obj: $(GENDIR)\busyinfo.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+calctrl.obj: $(GENDIR)\calctrl.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
choicdgg.obj: $(GENDIR)\choicdgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dirctrlg.obj: $(GENDIR)\dirctrlg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dragimgg.obj: $(GENDIR)\dragimgg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
grid.obj: $(GENDIR)\grid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+gridctrl.obj: $(GENDIR)\gridctrl.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gridsel.obj: $(GENDIR)\gridsel.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
laywin.obj: $(GENDIR)\laywin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -934,13 +1048,16 @@ sashwin.obj: $(GENDIR)\sashwin.cpp
scrolwin.obj: $(GENDIR)\scrolwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+splash.obj: $(GENDIR)\splash.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
splitter.obj: $(GENDIR)\splitter.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
statusbr.obj: $(GENDIR)\statusbr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-tabg.obj: $(GENDIR)\tabg.cpp
+tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textdlgg.obj: $(GENDIR)\textdlgg.cpp
@@ -949,77 +1066,19 @@ textdlgg.obj: $(GENDIR)\textdlgg.cpp
tipdlg.obj: $(GENDIR)\tipdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-wizard.obj: $(GENDIR)\wizard.cpp
+tipwin.obj: $(GENDIR)\tipwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+treectlg.obj: $(GENDIR)\treectlg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+treelay.obj: $(GENDIR)\treelay.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-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) $<
+wizard.obj: $(GENDIR)\wizard.cpp
+ *$(CCC) $(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)
@@ -1070,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
@@ -1100,8 +1149,28 @@ clean_zlib: .SYMBOLIC
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
+jpeg: .SYMBOLIC
+ cd $(WXDIR)\src\jpeg
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_jpeg: .SYMBOLIC
+ cd $(WXDIR)\src\jpeg
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
+
+tiff: .SYMBOLIC
+ cd $(WXDIR)\src\tiff
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_tiff: .SYMBOLIC
+ cd $(WXDIR)\src\tiff
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
+
MFTYPE=wat
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
- cd $(WXWIN)\distrib\msw\tmake
+self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
+ cd $(WXDIR)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
- copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+ copy makefile.$(MFTYPE) $(WXDIR)\src\msw