Applied patch [ 658174 ] Adds wxT() and char->wxChar conversion

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 40f1caf6c499f726eedd2db7a1664c47e6ac14e7..cbac28a96f40baac07187ad6b26766063c8d86ff 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -46,6 +46,7 @@ GENERICOBJS= accel.obj &
        caret.obj &
        choicdgg.obj &
        colrdlgg.obj &
+       dcbuffer.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dirdlgg.obj &
@@ -58,11 +59,11 @@ GENERICOBJS= accel.obj &
        gridsel.obj &
        helpext.obj &
        helphtml.obj &
-       helpwxht.obj &
        imaglist.obj &
        laywin.obj &
        listctrl.obj &
        logg.obj &
+       mdig.obj &
        msgdlgg.obj &
        numdlgg.obj &
        panelg.obj &
@@ -80,6 +81,7 @@ GENERICOBJS= accel.obj &
        tabg.obj &
        tbarsmpl.obj &
        textdlgg.obj &
+       timer.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &
@@ -89,6 +91,8 @@ GENERICOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
+       artprov.obj &
+       artstd.obj &
        bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
@@ -143,9 +147,11 @@ COMMONOBJS = &
        hashmap.obj &
        helpbase.obj &
        http.obj &
+       iconbndl.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &
+       imagfill.obj &
        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &
@@ -166,6 +172,7 @@ COMMONOBJS = &
        menucmn.obj &
        mimecmn.obj &
        module.obj &
+       msgout.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &
@@ -183,6 +190,7 @@ COMMONOBJS = &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
+       settcmn.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &
@@ -236,7 +244,6 @@ MGLOBJS = app.obj &
        pen.obj &
        region.obj &
        settings.obj &
-       timer.obj &
        toplevel.obj &
        utils.obj &
        window.obj
@@ -272,10 +279,12 @@ UNIVOBJS = bmpbuttn.obj &
        statusbr.obj &
        textctrl.obj &
        theme.obj &
+       toolbar.obj &
        topluniv.obj &
        winuniv.obj
 
 UNIVTHEMEOBJS = gtk.obj &
+       metal.obj &
        win32.obj
 
 HTMLOBJS = helpctrl.obj &
@@ -294,7 +303,6 @@ HTMLOBJS = helpctrl.obj &
        m_layout.obj &
        m_links.obj &
        m_list.obj &
-       m_meta.obj &
        m_pre.obj &
        m_style.obj &
        m_tables.obj &
@@ -311,8 +319,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -394,9 +402,6 @@ region.obj:     $(MGLDIR)\region.cpp
 settings.obj:     $(MGLDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-timer.obj:     $(MGLDIR)\timer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 toplevel.obj:     $(MGLDIR)\toplevel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -504,6 +509,9 @@ textctrl.obj:     $(UNIVDIR)\textctrl.cpp
 theme.obj:     $(UNIVDIR)\theme.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toolbar.obj:     $(UNIVDIR)\toolbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 topluniv.obj:     $(UNIVDIR)\topluniv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -515,6 +523,9 @@ winuniv.obj:     $(UNIVDIR)\winuniv.cpp
 gtk.obj:     $(UNIVTHEMEDIR)\gtk.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+metal.obj:     $(UNIVTHEMEDIR)\metal.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -526,6 +537,12 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+artprov.obj:     $(COMMDIR)\artprov.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj:     $(COMMDIR)\artstd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -688,6 +705,9 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -697,6 +717,9 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagfill.obj:     $(COMMDIR)\imagfill.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -757,6 +780,9 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+msgout.obj:     $(COMMDIR)\msgout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -808,6 +834,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+settcmn.obj:     $(COMMDIR)\settcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 sizer.obj:     $(COMMDIR)\sizer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -933,6 +962,9 @@ choicdgg.obj:     $(GENDIR)\choicdgg.cpp
 colrdlgg.obj:     $(GENDIR)\colrdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dcpsg.obj:     $(GENDIR)\dcpsg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -969,9 +1001,6 @@ helpext.obj:     $(GENDIR)\helpext.cpp
 helphtml.obj:     $(GENDIR)\helphtml.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpwxht.obj:     $(GENDIR)\helpwxht.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 imaglist.obj:     $(GENDIR)\imaglist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -984,6 +1013,9 @@ listctrl.obj:     $(GENDIR)\listctrl.cpp
 logg.obj:     $(GENDIR)\logg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mdig.obj:     $(GENDIR)\mdig.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1035,6 +1067,9 @@ tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
 textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+timer.obj:     $(GENDIR)\timer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1104,9 +1139,6 @@ m_links.obj:     $(HTMLDIR)\m_links.cpp
 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) $<