Compile fixes,

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 725af9a4db3e08c474ee74b83efcb364c1761b0d..741085b211a257368ba638c7409ae3c459262bc8 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,8 +1,6 @@
 
 
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -36,9 +34,9 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &
-       extdlgg.obj &
        gridg.obj &
        laywin.obj &
+       numdlgg.obj &
        panelg.obj &
        progdlgg.obj &
        prop.obj &
@@ -47,13 +45,16 @@ GENERICOBJS= busyinfo.obj &
        sashwin.obj &
        scrolwin.obj &
        splitter.obj &
+       statusbr.obj &
        tabg.obj &
        textdlgg.obj &
        tipdlg.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= colrdlgg.obj &
+NONESSENTIALOBJS= caret.obj &
+       colrdlgg.obj &
+       dcpsg.obj &
        dirdlgg.obj &
        fontdlgg.obj &
        helpxlp.obj &
@@ -63,14 +64,14 @@ NONESSENTIALOBJS= colrdlgg.obj &
        notebook.obj &
        printps.obj &
        prntdlgg.obj &
-       statusbr.obj &
        treectrl.obj
 
 COMMONOBJS = &
        y_tab.obj &
-       extended.obj &
+       choiccmn.obj &
        cmndata.obj &
        config.obj &
+       ctrlcmn.obj &
        date.obj &
        datstrm.obj &
        db.obj &
@@ -82,6 +83,8 @@ COMMONOBJS = &
        dynarray.obj &
        dynlib.obj &
        event.obj &
+       extended.obj &
+       ffile.obj &
        file.obj &
        fileconf.obj &
        filefn.obj &
@@ -117,14 +120,16 @@ COMMONOBJS = &
        resource.obj &
        sckaddr.obj &
        sckfile.obj &
-       sckint.obj &
        sckipc.obj &
        sckstrm.obj &
+       sizer.obj &
        socket.obj &
+       strconv.obj &
        stream.obj &
        string.obj &
        tbarbase.obj &
        tbarsmpl.obj &
+       textcmn.obj &
        textfile.obj &
        time.obj &
        timercmn.obj &
@@ -141,7 +146,7 @@ COMMONOBJS = &
        wincmn.obj &
        wxchar.obj &
        wxexpr.obj &
-       zipstream.obj &
+       zipstrm.obj &
        zstream.obj
 
 MSWOBJS = accel.obj &
@@ -248,8 +253,8 @@ $(LIBTARGET) : $(OBJECTS)
 #    %create tmp.lbc
 #    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
-       
-       
+
+
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)
@@ -531,12 +536,18 @@ xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
 ########################################################
 # Common objects (always compiled)
 
+choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 date.obj:     $(COMMDIR)\date.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -570,6 +581,12 @@ dynlib.obj:     $(COMMDIR)\dynlib.cpp
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+extended.obj:     $(COMMDIR)\extended.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ffile.obj:     $(COMMDIR)\ffile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 file.obj:     $(COMMDIR)\file.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -675,18 +692,21 @@ sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
 sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckint.obj:     $(COMMDIR)\sckint.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sizer.obj:     $(COMMDIR)\sizer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+strconv.obj:     $(COMMDIR)\strconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -699,6 +719,9 @@ tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
 tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+textcmn.obj:     $(COMMDIR)\textcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -747,7 +770,7 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zipstream.obj:     $(COMMDIR)\zipstream.cpp
+zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 zstream.obj:     $(COMMDIR)\zstream.cpp
@@ -755,9 +778,6 @@ zstream.obj:     $(COMMDIR)\zstream.cpp
 
 
 
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
-
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
@@ -779,15 +799,15 @@ busyinfo.obj:     $(GENDIR)\busyinfo.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-extdlgg.obj:     $(GENDIR)\extdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+numdlgg.obj:     $(GENDIR)\numdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -812,6 +832,9 @@ scrolwin.obj:     $(GENDIR)\scrolwin.cpp
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+statusbr.obj:     $(GENDIR)\statusbr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -891,9 +914,9 @@ wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O) 
+  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O) 
+  infutil$(O) inffast$(O)
 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
        $(CC) -c $(CFLAGS) $*.c
@@ -969,3 +992,8 @@ clean_zlib:   .SYMBOLIC
     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
+       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\msw