1. warning in gtk/menu.cpp fixed

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 62abd23ccfc485c51d2c07cd522499b1962832fb..4fad98fd22092cb5ecf297af99676c6992e5b706 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
 #!/binb/wmake.exe
 

-# This file was automatically generated by tmake at 14:31, 2000/01/19
+# This file was automatically generated by tmake at 12:25, 2000/02/28

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -42,6 +42,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &

+       dragimgg.obj &

        grid.obj &
        laywin.obj &
        logg.obj &
        grid.obj &
        laywin.obj &
        logg.obj &


@@ -59,6 +60,7 @@ GENERICOBJS= busyinfo.obj &
        tbarsmpl.obj &
        textdlgg.obj &
        tipdlg.obj &
        tbarsmpl.obj &
        textdlgg.obj &
        tipdlg.obj &

+       treelay.obj &

        wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
        wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,


@@ -99,6 +101,7 @@ COMMONOBJS = &
        dbtable.obj &
        dcbase.obj &
        dlgcmn.obj &
        dbtable.obj &
        dcbase.obj &
        dlgcmn.obj &

+       dndcmn.obj &

        dobjcmn.obj &
        docmdi.obj &
        docview.obj &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &


@@ -116,9 +119,11 @@ COMMONOBJS = &
        fontmap.obj &
        framecmn.obj &
        fs_inet.obj &
        fontmap.obj &
        framecmn.obj &
        fs_inet.obj &

+       fs_mem.obj &

        fs_zip.obj &
        ftp.obj &
        gdicmn.obj &
        fs_zip.obj &
        ftp.obj &
        gdicmn.obj &

+       geometry.obj &

        gifdecod.obj &
        hash.obj &
        helpbase.obj &
        gifdecod.obj &
        hash.obj &
        helpbase.obj &


@@ -227,6 +232,7 @@ MSWOBJS = accel.obj &
        gaugemsw.obj &
        gdiimage.obj &
        gdiobj.obj &
        gaugemsw.obj &
        gdiimage.obj &
        gdiobj.obj &

+       glcanvas.obj &

        gsocket.obj &
        helpwin.obj &
        icon.obj &
        gsocket.obj &
        helpwin.obj &
        icon.obj &


@@ -447,6 +453,9 @@ gdiimage.obj:     $(MSWDIR)\gdiimage.cpp
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+glcanvas.obj:     $(MSWDIR)\glcanvas.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 gsocket.obj:     $(MSWDIR)\gsocket.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 gsocket.obj:     $(MSWDIR)\gsocket.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -662,6 +671,9 @@ dcbase.obj:     $(COMMDIR)\dcbase.cpp
 dlgcmn.obj:     $(COMMDIR)\dlgcmn.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) $<
 
 dobjcmn.obj:     $(COMMDIR)\dobjcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -713,6 +725,9 @@ framecmn.obj:     $(COMMDIR)\framecmn.cpp
 fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
 fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -722,6 +737,9 @@ ftp.obj:     $(COMMDIR)\ftp.cpp
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+geometry.obj:     $(COMMDIR)\geometry.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -982,6 +1000,9 @@ textdlgg.obj:     $(GENDIR)\textdlgg.cpp
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+treelay.obj:     $(GENDIR)\treelay.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -1134,7 +1155,7 @@ clean_zlib:   .SYMBOLIC
     cd $(WXDIR)\src\msw
 
 MFTYPE=wat
     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)
        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)

-       copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+       copy makefile.$(MFTYPE) $(WXDIR)\src\msw