X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..dd10a6469643932f22cd6c8e7e63a79d4b57ef50:/src/msw/makefile.dos?ds=sidebyside

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 94e781a7dd..f99d610e1c 100644
--- 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,7 +164,8 @@ COMMONOBJS = \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj
 
-MSWOBJS = $(MSWDIR)\accel.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 \
 		$(MSWDIR)\bmpbuttn.obj \
@@ -213,8 +213,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\minifram.obj \
 		$(MSWDIR)\msgdlg.obj \
 		$(MSWDIR)\nativdlg.obj \
-		$(MSWDIR)\ownerdrw.obj \
-		$(MSWDIR)\palette.obj \
+		$(MSWDIR)\ownerdrw.obj
+
+MSWOBJS2 = $(MSWDIR)\palette.obj \
 		$(MSWDIR)\pen.obj \
 		$(MSWDIR)\penwin.obj \
 		$(MSWDIR)\printdlg.obj \
@@ -245,21 +246,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \
 
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 
 # Normal, static library
-all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
-
-
-# $(WXDIR)\lib\wx.lib:      dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-# 	-erase $(LIBTARGET)
-# 	lib /PAGESIZE:128 @<<
-# $(LIBTARGET)
-# y
-# $(OBJECTS) $(PERIPH_LIBS)
-# nul
-# ;
-# <<
+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
@@ -281,12 +271,22 @@ nul
 ;
 <<
 
-$(WXDIR)\lib\wx3.lib:      $(MSWOBJS)
+$(WXDIR)\lib\wx3.lib:      $(MSWOBJS1)
 	-erase $(WXDIR)\lib\wx3.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx3.lib
 y
-$(MSWOBJS)
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx4.lib:      $(MSWOBJS2)
+	-erase $(WXDIR)\lib\wx4.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx4.lib
+y
+$(MSWOBJS2)
 nul
 ;
 <<
@@ -477,9 +477,9 @@ $(MSWDIR)/gdiobj.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/gsocket.obj:     $*.$(SRCSUFF)
+$(MSWDIR)/gsocket.obj:     $*.c
         cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
@@ -902,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)