assert is raised when using the thread sample (which works) so the test is

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 82ffbcd8f457b022a492767653d6c894e1a0fad2..4a121b3f4a301d8c316675a38800514cf0c8116a 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -63,15 +63,13 @@ GENERICOBJS= accel.obj &
        laywin.obj &
        listctrl.obj &
        logg.obj &
+       mdig.obj &
        msgdlgg.obj &
        numdlgg.obj &
        panelg.obj &
        printps.obj &
        prntdlgg.obj &
        progdlgg.obj &
-       prop.obj &
-       propform.obj &
-       proplist.obj &
        sashwin.obj &
        scrlwing.obj &
        spinctlg.obj &
@@ -84,11 +82,11 @@ GENERICOBJS= accel.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &
-       treelay.obj &
        wizard.obj
 
 COMMONOBJS = &
        y_tab.obj &
+       accesscmn.obj &
        appcmn.obj &
        artprov.obj &
        artstd.obj &
@@ -104,6 +102,7 @@ COMMONOBJS = &
        cshelp.obj &
        ctrlcmn.obj &
        ctrlsub.obj &
+       datacmn.obj &
        datetime.obj &
        datstrm.obj &
        db.obj &
@@ -116,6 +115,7 @@ COMMONOBJS = &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &
+       dpycmn.obj &
        dseldlg.obj &
        dynarray.obj &
        dynlib.obj &
@@ -171,10 +171,10 @@ COMMONOBJS = &
        menucmn.obj &
        mimecmn.obj &
        module.obj &
+       msgout.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &
-       odbc.obj &
        paper.obj &
        popupcmn.obj &
        prntbase.obj &
@@ -183,7 +183,7 @@ COMMONOBJS = &
        quantize.obj &
        radiocmn.obj &
        regex.obj &
-       resource.obj &
+       rgncmn.obj &
        sckaddr.obj &
        sckfile.obj &
        sckipc.obj &
@@ -196,6 +196,7 @@ COMMONOBJS = &
        stream.obj &
        string.obj &
        sysopt.obj &
+       taskbarcmn.obj &
        tbarbase.obj &
        textbuf.obj &
        textcmn.obj &
@@ -215,7 +216,6 @@ COMMONOBJS = &
        wfstream.obj &
        wincmn.obj &
        wxchar.obj &
-       wxexpr.obj &
        xpmdecod.obj &
        zipstrm.obj &
        zstream.obj
@@ -301,7 +301,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 &
@@ -533,6 +532,9 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 ########################################################
 # Common objects (always compiled)
 
+accesscmn.obj:     $(COMMDIR)\accesscmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -578,6 +580,9 @@ ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+datacmn.obj:     $(COMMDIR)\datacmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -614,6 +619,9 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dpycmn.obj:     $(COMMDIR)\dpycmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -779,6 +787,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) $<
 
@@ -788,9 +799,6 @@ nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-odbc.obj:     $(COMMDIR)\odbc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -815,7 +823,7 @@ radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 regex.obj:     $(COMMDIR)\regex.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-resource.obj:     $(COMMDIR)\resource.cpp
+rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
@@ -854,6 +862,9 @@ string.obj:     $(COMMDIR)\string.cpp
 sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -911,9 +922,6 @@ wincmn.obj:     $(COMMDIR)\wincmn.cpp
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1009,6 +1017,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) $<
 
@@ -1027,15 +1038,6 @@ prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prop.obj:     $(GENDIR)\prop.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-propform.obj:     $(GENDIR)\propform.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-proplist.obj:     $(GENDIR)\proplist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1072,9 +1074,6 @@ tipwin.obj:     $(GENDIR)\tipwin.cpp
 treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-treelay.obj:     $(GENDIR)\treelay.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1132,9 +1131,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) $<