submenu preparation in two methods encapsulated

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index cf53427e6cb036a680e471b2cd3439bec0b0c44a..cbac28a96f40baac07187ad6b26766063c8d86ff 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -59,11 +59,11 @@ GENERICOBJS= accel.obj &
        gridsel.obj &
        helpext.obj &
        helphtml.obj &
        gridsel.obj &
        helpext.obj &
        helphtml.obj &

-       helpwxht.obj &

        imaglist.obj &
        laywin.obj &
        listctrl.obj &
        logg.obj &
        imaglist.obj &
        laywin.obj &
        listctrl.obj &
        logg.obj &

+       mdig.obj &

        msgdlgg.obj &
        numdlgg.obj &
        panelg.obj &
        msgdlgg.obj &
        numdlgg.obj &
        panelg.obj &


@@ -147,9 +147,11 @@ COMMONOBJS = &
        hashmap.obj &
        helpbase.obj &
        http.obj &
        hashmap.obj &
        helpbase.obj &
        http.obj &

+       iconbndl.obj &

        imagall.obj &
        imagbmp.obj &
        image.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &

+       imagfill.obj &

        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &
        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &


@@ -170,6 +172,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 &


@@ -187,6 +190,7 @@ COMMONOBJS = &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &

+       settcmn.obj &

        sizer.obj &
        socket.obj &
        statbar.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &


@@ -280,6 +284,7 @@ UNIVOBJS = bmpbuttn.obj &
        winuniv.obj
 
 UNIVTHEMEOBJS = gtk.obj &
        winuniv.obj
 
 UNIVTHEMEOBJS = gtk.obj &

+       metal.obj &

        win32.obj
 
 HTMLOBJS = helpctrl.obj &
        win32.obj
 
 HTMLOBJS = helpctrl.obj &


@@ -298,7 +303,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 &


@@ -519,6 +523,9 @@ winuniv.obj:     $(UNIVDIR)\winuniv.cpp
 gtk.obj:     $(UNIVTHEMEDIR)\gtk.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gtk.obj:     $(UNIVTHEMEDIR)\gtk.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+metal.obj:     $(UNIVTHEMEDIR)\metal.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -698,6 +705,9 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -707,6 +717,9 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -767,6 +780,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) $<
 


@@ -818,6 +834,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -982,9 +1001,6 @@ helpext.obj:     $(GENDIR)\helpext.cpp
 helphtml.obj:     $(GENDIR)\helphtml.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 helphtml.obj:     $(GENDIR)\helphtml.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -997,6 +1013,9 @@ listctrl.obj:     $(GENDIR)\listctrl.cpp
 logg.obj:     $(GENDIR)\logg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 logg.obj:     $(GENDIR)\logg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1120,9 +1139,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) $<