Applied patch [ 652491 ] Update makefiles for mingw

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index c937bb2ea8f0a6cc06cebf84fd94f96c623524bd..c752958bfe91a1176578f66d9c6f7ccb5c9cc048 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -86,6 +86,7 @@ NONESSENTIALOBJS= accel.obj &
        helphtml.obj &
        imaglist.obj &
        listctrl.obj &
        helphtml.obj &
        imaglist.obj &
        listctrl.obj &

+       mdig.obj &

        msgdlgg.obj &
        notebook.obj &
        paletteg.obj &
        msgdlgg.obj &
        notebook.obj &
        paletteg.obj &


@@ -178,6 +179,7 @@ COMMONOBJS = &
        menucmn.obj &
        mimecmn.obj &
        module.obj &
        menucmn.obj &
        mimecmn.obj &
        module.obj &

+       msgout.obj &

        mstream.obj &
        nbkbase.obj &
        object.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &


@@ -357,7 +359,6 @@ HTMLOBJS = helpctrl.obj &
        m_layout.obj &
        m_links.obj &
        m_list.obj &
        m_layout.obj &
        m_links.obj &
        m_list.obj &

-       m_meta.obj &

        m_pre.obj &
        m_style.obj &
        m_tables.obj &
        m_pre.obj &
        m_style.obj &
        m_tables.obj &


@@ -985,6 +986,9 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1293,9 +1297,6 @@ m_links.obj:     $(HTMLDIR)\m_links.cpp
 m_list.obj:     $(HTMLDIR)\m_list.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_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<