1. more code commented out by DW (@#%#%!#%!@) uncommented

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 9110b2d2733d0212cd0a467798bcda4bccc99a0e..f99d610e1c7de207bfe8cd6b6184af245b73f3fd 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,4 @@
-
-
-# This file was automatically generated by tmake at 18:37, 1999/10/22
+# This file was automatically generated by tmake at 00:24, 1999/10/28
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -131,6 +129,7 @@ COMMONOBJS = \
                $(COMMDIR)\list.obj \
                $(COMMDIR)\log.obj \
                $(COMMDIR)\memory.obj \
+               $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\object.obj \
@@ -165,6 +164,7 @@ COMMONOBJS = \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
+# we can't have all objects in one list because the library becomes too big
 MSWOBJS1 = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\bitmap.obj \
@@ -213,11 +213,11 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
-               $(MSWDIR)\ownerdrw.obj \
-               $(MSWDIR)\palette.obj \
-               $(MSWDIR)\pen.obj
+               $(MSWDIR)\ownerdrw.obj
 
-MSWOBJS2 = $(MSWDIR)\penwin.obj \
+MSWOBJS2 = $(MSWDIR)\palette.obj \
+               $(MSWDIR)\pen.obj \
+               $(MSWDIR)\penwin.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
@@ -251,7 +251,6 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 # Normal, static library
 all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
 
-
 $(WXDIR)\lib\wx1.lib:      $(COMMONOBJS) $(PERIPH_LIBS)
        -erase $(WXDIR)\lib\wx1.lib
        lib /PAGESIZE:128 @<<
@@ -480,7 +479,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 
 $(MSWDIR)/gsocket.obj:     $*.c
         cl @<<
-$(CPPFLAGS2) /Fo$@ /c $*.c
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
@@ -903,6 +902,11 @@ $(COMMDIR)/memory.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/menucmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/module.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)