fix making base for watcom (lib\base and console sample now compile)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 4bb931a5696a1385c91ddf6f7750a07c4c7ee41b..3c6e9e76ed7bbc19a30987e34e862cd155220aca 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -135,7 +135,7 @@ containr.cpp        Common
 cshelp.cpp     Common
 ctrlcmn.cpp    Common
 ctrlsub.cpp    Common
 cshelp.cpp     Common
 ctrlcmn.cpp    Common
 ctrlsub.cpp    Common

-datacmn.cpp    Common  Base
+datacmn.cpp    Common  

 datetime.cpp   Common  Base
 datstrm.cpp    Common  Base
 db.cpp Common  Win32Only,Base
 datetime.cpp   Common  Base
 datstrm.cpp    Common  Base
 db.cpp Common  Win32Only,Base

diff --git a/distrib/msw/tmake/watbase.t b/distrib/msw/tmake/watbase.t
index 62b229b8ab3490fe13213412e0cb3be9855ee096..9bd90fac90b9e45451e03f5926a74844f3ce9cdb 100644 (file)
--- a/distrib/msw/tmake/watbase.t
+++ b/distrib/msw/tmake/watbase.t
@@ -96,11 +96,11 @@ $(LIBTARGET) : $(OBJECTS)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)

-    -erase *.obj
+    -erase $(OUTPUTDIR)\*.obj

     -erase $(LIBTARGET)
     -erase $(LIBTARGET)

-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.lbc

 
 cleanall:   clean
     -erase $(LBCFILE)
 
 cleanall:   clean
     -erase $(LBCFILE)

diff --git a/src/msw/makebase.wat b/src/msw/makebase.wat
index f03e6d6dcc94b566766dc5b0bebefb5cfc787496..b3cccffa9e43627e8ba2b7162d66a63fbee6a351 100644 (file)
--- a/src/msw/makebase.wat
+++ b/src/msw/makebase.wat
@@ -30,7 +30,6 @@ COMMONOBJS = &
        $(OUTPUTDIR)\clntdata.obj &
        $(OUTPUTDIR)\cmdline.obj &
        $(OUTPUTDIR)\config.obj &
        $(OUTPUTDIR)\clntdata.obj &
        $(OUTPUTDIR)\cmdline.obj &
        $(OUTPUTDIR)\config.obj &

-       $(OUTPUTDIR)\datacmn.obj &

        $(OUTPUTDIR)\datetime.obj &
        $(OUTPUTDIR)\datstrm.obj &
        $(OUTPUTDIR)\db.obj &
        $(OUTPUTDIR)\datetime.obj &
        $(OUTPUTDIR)\datstrm.obj &
        $(OUTPUTDIR)\db.obj &


@@ -133,11 +132,11 @@ $(LIBTARGET) : $(OBJECTS)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)

-    -erase *.obj
+    -erase $(OUTPUTDIR)\*.obj

     -erase $(LIBTARGET)
     -erase $(LIBTARGET)

-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.lbc

 
 cleanall:   clean
     -erase $(LBCFILE)
 
 cleanall:   clean
     -erase $(LBCFILE)


@@ -198,9 +197,6 @@ $(OUTPUTDIR)\cmdline.obj:     $(COMMDIR)\cmdline.cpp
 $(OUTPUTDIR)\config.obj:     $(COMMDIR)\config.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\config.obj:     $(COMMDIR)\config.cpp
   *$(CXX) $(CXXFLAGS) $<
 

-$(OUTPUTDIR)\datacmn.obj:     $(COMMDIR)\datacmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-

 $(OUTPUTDIR)\datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CXX) $(CXXFLAGS) $<