X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fb3a512a85572ebf4b4f46eaf536727dfe4e01e..e2b34251cba8fd13818d99d04a336bd16126d44a:/src/msw/makefile.dos

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 9110b2d273..9112a5cdcd 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 14:24, 1999/11/15
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -85,7 +83,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\treectrl.obj \
 		$(GENDIR)\wizard.obj
 
-COMMONOBJS = \
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \
 		$(COMMDIR)\y_tab.obj \
 		$(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\choiccmn.obj \
@@ -113,6 +112,7 @@ COMMONOBJS = \
 		$(COMMDIR)\filefn.obj \
 		$(COMMDIR)\filesys.obj \
 		$(COMMDIR)\fontcmn.obj \
+		$(COMMDIR)\fontmap.obj \
 		$(COMMDIR)\framecmn.obj \
 		$(COMMDIR)\fs_inet.obj \
 		$(COMMDIR)\fs_zip.obj \
@@ -131,11 +131,14 @@ COMMONOBJS = \
 		$(COMMDIR)\list.obj \
 		$(COMMDIR)\log.obj \
 		$(COMMDIR)\memory.obj \
+		$(COMMDIR)\menucmn.obj \
 		$(COMMDIR)\module.obj \
 		$(COMMDIR)\mstream.obj \
 		$(COMMDIR)\object.obj \
 		$(COMMDIR)\objstrm.obj \
-		$(COMMDIR)\odbc.obj \
+		$(COMMDIR)\odbc.obj
+
+COMMONOBJS2 = \
 		$(COMMDIR)\paper.obj \
 		$(COMMDIR)\prntbase.obj \
 		$(COMMDIR)\resource.obj \
@@ -165,6 +168,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 \
@@ -196,6 +200,8 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\filedlg.obj \
 		$(MSWDIR)\font.obj \
 		$(MSWDIR)\fontdlg.obj \
+		$(MSWDIR)\fontenum.obj \
+		$(MSWDIR)\fontutil.obj \
 		$(MSWDIR)\frame.obj \
 		$(MSWDIR)\gaugemsw.obj \
 		$(MSWDIR)\gdiobj.obj \
@@ -213,11 +219,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 \
@@ -246,47 +252,56 @@ MSWOBJS2 = $(MSWDIR)\penwin.obj \
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \
 
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
+OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 
 # Normal, static library
-all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
-
+all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib
 
-$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS) $(PERIPH_LIBS)
+$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS1) $(PERIPH_LIBS)
 	-erase $(WXDIR)\lib\wx1.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx1.lib
 y
-$(COMMONOBJS) $(PERIPH_LIBS)
+$(COMMONOBJS1) $(PERIPH_LIBS)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx2.lib:      $(GENERICOBJS)
+$(WXDIR)\lib\wx2.lib:      $(COMMONOBJS2)
 	-erase $(WXDIR)\lib\wx2.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx2.lib
 y
-$(GENERICOBJS)
+$(COMMONOBJS2)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx3.lib:      $(MSWOBJS1)
+$(WXDIR)\lib\wx3.lib:      $(GENERICOBJS)
 	-erase $(WXDIR)\lib\wx3.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx3.lib
 y
-$(MSWOBJS1)
+$(GENERICOBJS)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx4.lib:      $(MSWOBJS2)
+$(WXDIR)\lib\wx4.lib:      $(MSWOBJS1)
 	-erase $(WXDIR)\lib\wx4.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx4.lib
 y
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx5.lib:      $(MSWOBJS2)
+	-erase $(WXDIR)\lib\wx5.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx5.lib
+y
 $(MSWOBJS2)
 nul
 ;
@@ -463,6 +478,16 @@ $(MSWDIR)/fontdlg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/fontenum.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(MSWDIR)/fontutil.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/frame.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -480,7 +505,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 
 $(MSWDIR)/gsocket.obj:     $*.c
         cl @<<
-$(CPPFLAGS2) /Fo$@ /c $*.c
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
@@ -813,6 +838,11 @@ $(COMMDIR)/fontcmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/fontmap.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/framecmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -903,6 +933,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)