wxUniv compilation fixes

[wxWidgets.git] / src / msw / makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6f99aac1b87312d44e79d8f0cbc49ddc805e5dd3..f2c59e80ea489fac20714b3719b0907becf94dcf 100644 (file)
--- 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 01:55, 2001/06/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 WAT.T!
 
 #
@@ -37,6 +37,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
+HTMLDIR=$(WXDIR)\src\html
 
 DOCDIR = $(WXDIR)\docs
 
@@ -57,7 +58,8 @@ GENERICOBJS= busyinfo.obj &
        propform.obj &
        proplist.obj &
        sashwin.obj &
-       scrolwin.obj &
+       scrlwing.obj &
+       spinctlg.obj &
        splash.obj &
        splitter.obj &
        statusbr.obj &
@@ -71,7 +73,8 @@ GENERICOBJS= 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= caret.obj &
+NONESSENTIALOBJS= accel.obj &
+       caret.obj &
        colrdlgg.obj &
        dcpsg.obj &
        dirdlgg.obj &
@@ -97,6 +100,7 @@ COMMONOBJS = &
        choiccmn.obj &
        clipcmn.obj &
        cmdline.obj &
+       cmdproc.obj &
        cmndata.obj &
        config.obj &
        cshelp.obj &
@@ -105,6 +109,7 @@ COMMONOBJS = &
        datetime.obj &
        datstrm.obj &
        db.obj &
+       dbgrid.obj &
        dbtable.obj &
        dcbase.obj &
        dircmn.obj &
@@ -132,6 +137,7 @@ COMMONOBJS = &
        fs_mem.obj &
        fs_zip.obj &
        ftp.obj &
+       gaugecmn.obj &
        gdicmn.obj &
        geometry.obj &
        gifdecod.obj &
@@ -161,14 +167,17 @@ COMMONOBJS = &
        mimecmn.obj &
        module.obj &
        mstream.obj &
+       nbkbase.obj &
        object.obj &
        objstrm.obj &
        odbc.obj &
        paper.obj &
+       popupcmn.obj &
        prntbase.obj &
        process.obj &
        protocol.obj &
        quantize.obj &
+       radiocmn.obj &
        resource.obj &
        sckaddr.obj &
        sckfile.obj &
@@ -309,10 +318,31 @@ MSWOBJS = accel.obj &
        wave.obj &
        window.obj
 
+HTMLOBJS = helpctrl.obj &
+       helpdata.obj &
+       helpfrm.obj &
+       htmlcell.obj &
+       htmlfilt.obj &
+       htmlpars.obj &
+       htmltag.obj &
+       htmlwin.obj &
+       htmprint.obj &
+       m_dflist.obj &
+       m_fonts.obj &
+       m_hline.obj &
+       m_image.obj &
+       m_layout.obj &
+       m_links.obj &
+       m_list.obj &
+       m_meta.obj &
+       m_pre.obj &
+       m_tables.obj &
+       winpars.obj
+
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -669,6 +699,9 @@ clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
 cmdline.obj:     $(COMMDIR)\cmdline.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+cmdproc.obj:     $(COMMDIR)\cmdproc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -693,6 +726,9 @@ datstrm.obj:     $(COMMDIR)\datstrm.cpp
 db.obj:     $(COMMDIR)\db.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dbgrid.obj:     $(COMMDIR)\dbgrid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dbtable.obj:     $(COMMDIR)\dbtable.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -774,6 +810,9 @@ fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
 ftp.obj:     $(COMMDIR)\ftp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gaugecmn.obj:     $(COMMDIR)\gaugecmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -861,6 +900,9 @@ module.obj:     $(COMMDIR)\module.cpp
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -873,6 +915,9 @@ odbc.obj:     $(COMMDIR)\odbc.cpp
 paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+popupcmn.obj:     $(COMMDIR)\popupcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 prntbase.obj:     $(COMMDIR)\prntbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -885,6 +930,9 @@ protocol.obj:     $(COMMDIR)\protocol.cpp
 quantize.obj:     $(COMMDIR)\quantize.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1049,7 +1097,10 @@ proplist.obj:     $(GENDIR)\proplist.cpp
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-scrolwin.obj:     $(GENDIR)\scrolwin.cpp
+scrlwing.obj:     $(GENDIR)\scrlwing.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+spinctlg.obj:     $(GENDIR)\spinctlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 splash.obj:     $(GENDIR)\splash.cpp
@@ -1084,6 +1135,73 @@ wizard.obj:     $(GENDIR)\wizard.cpp
 
 
 
+
+########################################################
+# HTML objects (always compiled)
+
+helpctrl.obj:     $(HTMLDIR)\helpctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpdata.obj:     $(HTMLDIR)\helpdata.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpfrm.obj:     $(HTMLDIR)\helpfrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmlcell.obj:     $(HTMLDIR)\htmlcell.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmlfilt.obj:     $(HTMLDIR)\htmlfilt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmlpars.obj:     $(HTMLDIR)\htmlpars.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmltag.obj:     $(HTMLDIR)\htmltag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmlwin.obj:     $(HTMLDIR)\htmlwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+htmprint.obj:     $(HTMLDIR)\htmprint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_dflist.obj:     $(HTMLDIR)\m_dflist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_fonts.obj:     $(HTMLDIR)\m_fonts.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_hline.obj:     $(HTMLDIR)\m_hline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_image.obj:     $(HTMLDIR)\m_image.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_layout.obj:     $(HTMLDIR)\m_layout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_links.obj:     $(HTMLDIR)\m_links.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_list.obj:     $(HTMLDIR)\m_list.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_meta.obj:     $(HTMLDIR)\m_meta.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_pre.obj:     $(HTMLDIR)\m_pre.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_tables.obj:     $(HTMLDIR)\m_tables.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+winpars.obj:     $(HTMLDIR)\winpars.cpp
+  *$(CCC) $(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) \