wxUniv compilation fixes

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index cbac28a96f40baac07187ad6b26766063c8d86ff..118ad35b98b7ff3794236fabef0b3530d1d7416e 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -58,7 +58,6 @@ GENERICOBJS= accel.obj &
        gridctrl.obj &
        gridsel.obj &
        helpext.obj &
        gridctrl.obj &
        gridsel.obj &
        helpext.obj &

-       helphtml.obj &

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


@@ -70,11 +69,9 @@ GENERICOBJS= accel.obj &
        printps.obj &
        prntdlgg.obj &
        progdlgg.obj &
        printps.obj &
        prntdlgg.obj &
        progdlgg.obj &

-       prop.obj &
-       propform.obj &
-       proplist.obj &

        sashwin.obj &
        scrlwing.obj &
        sashwin.obj &
        scrlwing.obj &

+       selstore.obj &

        spinctlg.obj &
        splash.obj &
        splitter.obj &
        spinctlg.obj &
        splash.obj &
        splitter.obj &


@@ -85,11 +82,12 @@ GENERICOBJS= accel.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &

-       treelay.obj &

        wizard.obj
 
 COMMONOBJS = &
        y_tab.obj &
        wizard.obj
 
 COMMONOBJS = &
        y_tab.obj &

+       accesscmn.obj &
+       appbase.obj &

        appcmn.obj &
        artprov.obj &
        artstd.obj &
        appcmn.obj &
        artprov.obj &
        artstd.obj &


@@ -105,6 +103,7 @@ COMMONOBJS = &
        cshelp.obj &
        ctrlcmn.obj &
        ctrlsub.obj &
        cshelp.obj &
        ctrlcmn.obj &
        ctrlsub.obj &

+       datacmn.obj &

        datetime.obj &
        datstrm.obj &
        db.obj &
        datetime.obj &
        datstrm.obj &
        db.obj &


@@ -117,6 +116,7 @@ COMMONOBJS = &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &

+       dpycmn.obj &

        dseldlg.obj &
        dynarray.obj &
        dynlib.obj &
        dseldlg.obj &
        dynarray.obj &
        dynlib.obj &


@@ -132,6 +132,8 @@ COMMONOBJS = &
        filefn.obj &
        filename.obj &
        filesys.obj &
        filefn.obj &
        filename.obj &
        filesys.obj &

+       fldlgcmn.obj &
+       fmapbase.obj &

        fontcmn.obj &
        fontmap.obj &
        framecmn.obj &
        fontcmn.obj &
        fontmap.obj &
        framecmn.obj &


@@ -176,7 +178,6 @@ COMMONOBJS = &
        mstream.obj &
        nbkbase.obj &
        object.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &

-       odbc.obj &

        paper.obj &
        popupcmn.obj &
        prntbase.obj &
        paper.obj &
        popupcmn.obj &
        prntbase.obj &


@@ -185,7 +186,7 @@ COMMONOBJS = &
        quantize.obj &
        radiocmn.obj &
        regex.obj &
        quantize.obj &
        radiocmn.obj &
        regex.obj &

-       resource.obj &
+       rgncmn.obj &

        sckaddr.obj &
        sckfile.obj &
        sckipc.obj &
        sckaddr.obj &
        sckfile.obj &
        sckipc.obj &


@@ -194,10 +195,12 @@ COMMONOBJS = &
        sizer.obj &
        socket.obj &
        statbar.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &

+       stopwatch.obj &

        strconv.obj &
        stream.obj &
        string.obj &
        sysopt.obj &
        strconv.obj &
        stream.obj &
        string.obj &
        sysopt.obj &

+       taskbarcmn.obj &

        tbarbase.obj &
        textbuf.obj &
        textcmn.obj &
        tbarbase.obj &
        textbuf.obj &
        textcmn.obj &


@@ -217,7 +220,6 @@ COMMONOBJS = &
        wfstream.obj &
        wincmn.obj &
        wxchar.obj &
        wfstream.obj &
        wincmn.obj &
        wxchar.obj &

-       wxexpr.obj &

        xpmdecod.obj &
        zipstrm.obj &
        zstream.obj
        xpmdecod.obj &
        zipstrm.obj &
        zstream.obj


@@ -534,6 +536,12 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 ########################################################
 # Common objects (always compiled)
 
 ########################################################
 # Common objects (always compiled)
 

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

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


@@ -579,6 +587,9 @@ ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -615,6 +626,9 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -660,6 +674,12 @@ filename.obj:     $(COMMDIR)\filename.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -792,9 +812,6 @@ nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -819,7 +836,7 @@ radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 regex.obj:     $(COMMDIR)\regex.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp


@@ -846,6 +863,9 @@ socket.obj:     $(COMMDIR)\socket.cpp
 statbar.obj:     $(COMMDIR)\statbar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 statbar.obj:     $(COMMDIR)\statbar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -858,6 +878,9 @@ string.obj:     $(COMMDIR)\string.cpp
 sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -915,9 +938,6 @@ wincmn.obj:     $(COMMDIR)\wincmn.cpp
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -998,9 +1018,6 @@ gridsel.obj:     $(GENDIR)\gridsel.cpp
 helpext.obj:     $(GENDIR)\helpext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 helpext.obj:     $(GENDIR)\helpext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1034,21 +1051,15 @@ prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
 scrlwing.obj:     $(GENDIR)\scrlwing.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 scrlwing.obj:     $(GENDIR)\scrlwing.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1079,9 +1090,6 @@ tipwin.obj:     $(GENDIR)\tipwin.cpp
 treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 treectlg.obj:     $(GENDIR)\treectlg.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) $<