VC++ 1.5 makefile fixes (lib split, C objs)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-25 07:37:40 +00:00
parent c54f522622
commit 876325579b
2 changed files with 35 additions and 29 deletions

View File

@@ -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 09:37, 1999/10/25
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
@@ -165,6 +163,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 +212,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 +250,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 +478,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
$(MSWDIR)/gsocket.obj: $*.c
cl @<<
$(CPPFLAGS2) /Fo$@ /c $*.c
$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
<<
$(MSWDIR)/helpwin.obj: $*.$(SRCSUFF)