compilation fix for non-threaded compilation (threads are still broken

[wxWidgets.git] / src / msw / makefile.dos

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index c31101c5b0f69bd4bd9f8bd551d3e38e6ebbf31e..f818a5491dbca7a29cea4685617b2d13d43126d6 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 11:51, 1999/12/12
+# This file was automatically generated by tmake at 19:06, 2000/01/05
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -58,6 +58,7 @@ OLEDIR=.\ole
 MSWDIR=.
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
+               $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
                $(GENDIR)\dirdlgg.obj \
                $(GENDIR)\grid.obj \
@@ -78,6 +79,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
                $(GENDIR)\tabg.obj \
+               $(GENDIR)\tbarsmpl.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\treectrl.obj \
@@ -89,11 +91,11 @@ COMMONOBJS1 = \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
+               $(COMMDIR)\cmdline.obj \
                $(COMMDIR)\cmndata.obj \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
-               $(COMMDIR)\date.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
@@ -104,6 +106,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
+               $(COMMDIR)\encconv.obj \
                $(COMMDIR)\event.obj \
                $(COMMDIR)\extended.obj \
                $(COMMDIR)\ffile.obj \
@@ -148,10 +151,8 @@ COMMONOBJS2 = \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\tbarbase.obj \
-               $(COMMDIR)\tbarsmpl.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
-               $(COMMDIR)\time.obj \
                $(COMMDIR)\timercmn.obj \
                $(COMMDIR)\tokenzr.obj \
                $(COMMDIR)\txtstrm.obj \
@@ -741,27 +742,27 @@ $(COMMDIR)/clipcmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/cmndata.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/cmdline.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/config.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/cmndata.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/ctrlcmn.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/config.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/ctrlcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/date.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -816,6 +817,11 @@ $(COMMDIR)/dynlib.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/encconv.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1026,11 +1032,6 @@ $(COMMDIR)/tbarbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/tbarsmpl.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/textcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1041,11 +1042,6 @@ $(COMMDIR)/textfile.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/time.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/timercmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1126,6 +1122,11 @@ $(GENDIR)/busyinfo.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/calctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1226,6 +1227,11 @@ $(GENDIR)/tabg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/tbarsmpl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/textdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)