Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. regenerated makefiles

Browse Source 
2. wxNewSizer compiles under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-08-08 21:56:43 +00:00
parent 61d514bb2f
commit 77671fd2d6
10 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/sizer.cpp
View File

@@ -9,13 +9,17 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WXSIZERS_H__
#define __WXSIZERS_H__
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "sizer.h" #pragma implementation "sizer.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/utils.h" #include "wx/utils.h"
@@ -143,10 +147,11 @@ void wxNewSizer::SetSizeHints( wxWindow *window )
wxSize wxNewSizer::GetMinWindowSize( wxWindow *window ) wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
{ {
wxSize min( GetMinSize() ); wxSize minSize( GetMinSize() );
wxSize size( window->GetSize() ); wxSize size( window->GetSize() );
wxSize client_size( window->GetClientSize() ); wxSize client_size( window->GetClientSize() );
return wxSize( min.x+size.x-client_size.x, min.y+size.y-client_size.y ); return wxSize( minSize.x+size.x-client_size.x,
minSize.y+size.y-client_size.y );
} }
void wxNewSizer::SetDimension( int x, int y, int width, int height ) void wxNewSizer::SetDimension( int x, int y, int width, int height )
@@ -380,6 +385,3 @@ wxSize wxBoxNewSizer::CalcMin()
return wxSize( m_minWidth, m_minHeight ); return wxSize( m_minWidth, m_minHeight );
} }
#endif
// __SIZERS_H__

5
src/gtk/Makefile
View File

@@ -1,5 +1,5 @@
# This file was automatically generated by tmake at 21:49, 1999/07/29 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
# #
@@ -111,6 +111,7 @@ COMMONOBJS = \
$(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckipc.$(OBJSUFF) \
$(COMMDIR)/sckstrm.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \
$(COMMDIR)/socket.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -132,7 +133,7 @@ COMMONOBJS = \
$(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \
$(COMMDIR)/wxexpr.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \
$(COMMDIR)/zipstream.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF) $(COMMDIR)/zstream.$(OBJSUFF)
HTMLOBJS = \ HTMLOBJS = \

5
src/gtk1/Makefile
View File

@@ -1,5 +1,5 @@
# This file was automatically generated by tmake at 21:49, 1999/07/29 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
# #
@@ -111,6 +111,7 @@ COMMONOBJS = \
$(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckipc.$(OBJSUFF) \
$(COMMDIR)/sckstrm.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \
$(COMMDIR)/socket.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -132,7 +133,7 @@ COMMONOBJS = \
$(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \
$(COMMDIR)/wxexpr.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \
$(COMMDIR)/zipstream.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF) $(COMMDIR)/zstream.$(OBJSUFF)
HTMLOBJS = \ HTMLOBJS = \

9
src/msw/makefile.b32
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 17:00, 1999/08/06 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
# #
@@ -164,6 +164,7 @@ COMMONOBJS = \
$(MSWDIR)\sckipc.obj \ $(MSWDIR)\sckipc.obj \
$(MSWDIR)\sckstrm.obj \ $(MSWDIR)\sckstrm.obj \
$(MSWDIR)\socket.obj \ $(MSWDIR)\socket.obj \
$(MSWDIR)\strconv.obj \
$(MSWDIR)\stream.obj \ $(MSWDIR)\stream.obj \
$(MSWDIR)\string.obj \ $(MSWDIR)\string.obj \
$(MSWDIR)\tbarbase.obj \ $(MSWDIR)\tbarbase.obj \
@@ -185,7 +186,7 @@ COMMONOBJS = \
$(MSWDIR)\wincmn.obj \ $(MSWDIR)\wincmn.obj \
$(MSWDIR)\wxchar.obj \ $(MSWDIR)\wxchar.obj \
$(MSWDIR)\wxexpr.obj \ $(MSWDIR)\wxexpr.obj \
$(MSWDIR)\zipstream.obj \ $(MSWDIR)\zipstrm.obj \
$(MSWDIR)\zstream.obj $(MSWDIR)\zstream.obj
MSWOBJS = $(MSWDIR)\accel.obj \ MSWOBJS = $(MSWDIR)\accel.obj \
@@ -622,6 +623,8 @@ $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
$(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF) $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
@@ -664,7 +667,7 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF) $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF) $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF) $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)

9
src/msw/makefile.bcc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 00:42, 1999/07/27 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
# #
@@ -144,6 +144,7 @@ COMMONOBJS = \
$(MSWDIR)\paper.obj \ $(MSWDIR)\paper.obj \
$(MSWDIR)\prntbase.obj \ $(MSWDIR)\prntbase.obj \
$(MSWDIR)\resource.obj \ $(MSWDIR)\resource.obj \
$(MSWDIR)\strconv.obj \
$(MSWDIR)\stream.obj \ $(MSWDIR)\stream.obj \
$(MSWDIR)\string.obj \ $(MSWDIR)\string.obj \
$(MSWDIR)\tbarbase.obj \ $(MSWDIR)\tbarbase.obj \
@@ -164,7 +165,7 @@ COMMONOBJS = \
$(MSWDIR)\wincmn.obj \ $(MSWDIR)\wincmn.obj \
$(MSWDIR)\wxchar.obj \ $(MSWDIR)\wxchar.obj \
$(MSWDIR)\wxexpr.obj \ $(MSWDIR)\wxexpr.obj \
$(MSWDIR)\zipstream.obj \ $(MSWDIR)\zipstrm.obj \
$(MSWDIR)\zstream.obj \ $(MSWDIR)\zstream.obj \
${MSWDIR}\resourc2.cpp ${MSWDIR}\resourc2.cpp
@@ -515,6 +516,8 @@ $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF) $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF) $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF) $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
@@ -555,7 +558,7 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF) $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF) $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF) $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)

12
src/msw/makefile.dos
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 00:42, 1999/07/27 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
# #
@@ -132,6 +132,7 @@ COMMONOBJS = \
$(COMMDIR)\paper.obj \ $(COMMDIR)\paper.obj \
$(COMMDIR)\prntbase.obj \ $(COMMDIR)\prntbase.obj \
$(COMMDIR)\resource.obj \ $(COMMDIR)\resource.obj \
$(COMMDIR)\strconv.obj \
$(COMMDIR)\stream.obj \ $(COMMDIR)\stream.obj \
$(COMMDIR)\string.obj \ $(COMMDIR)\string.obj \
$(COMMDIR)\tbarbase.obj \ $(COMMDIR)\tbarbase.obj \
@@ -152,7 +153,7 @@ COMMONOBJS = \
$(COMMDIR)\wincmn.obj \ $(COMMDIR)\wincmn.obj \
$(COMMDIR)\wxchar.obj \ $(COMMDIR)\wxchar.obj \
$(COMMDIR)\wxexpr.obj \ $(COMMDIR)\wxexpr.obj \
$(COMMDIR)\zipstream.obj \ $(COMMDIR)\zipstrm.obj \
$(COMMDIR)\zstream.obj $(COMMDIR)\zstream.obj
MSWOBJS = $(MSWDIR)\accel.obj \ MSWOBJS = $(MSWDIR)\accel.obj \
@@ -896,6 +897,11 @@ $(COMMDIR)/resource.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/strconv.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/stream.obj: $*.$(SRCSUFF) $(COMMDIR)/stream.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -996,7 +1002,7 @@ $(COMMDIR)/wxexpr.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/zipstream.obj: $*.$(SRCSUFF) $(COMMDIR)/zipstrm.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<

10
src/msw/makefile.g95
View File

@@ -1,5 +1,5 @@
# This file was automatically generated by tmake at 21:49, 1999/07/29 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
# #
@@ -114,6 +114,7 @@ COMMONOBJS = \
$(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckipc.$(OBJSUFF) \
$(COMMDIR)/sckstrm.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \
$(COMMDIR)/socket.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -134,7 +135,7 @@ COMMONOBJS = \
$(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \
$(COMMDIR)/wxexpr.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \
$(COMMDIR)/zipstream.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF) $(COMMDIR)/zstream.$(OBJSUFF)
HTMLOBJS = \ HTMLOBJS = \
@@ -387,14 +388,19 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
clean: clean:
-erase *.o -erase *.o
-erase *.bak
-erase core -erase core
-erase ..\common\y_tab.c -erase ..\common\y_tab.c
-erase ..\common\lex_yy.c -erase ..\common\lex_yy.c
-erase ..\common\*.o -erase ..\common\*.o
-erase ..\common\*.bak
-erase ..\generic\*.o -erase ..\generic\*.o
-erase ..\generic\*.bak
-erase ..\html\*.o -erase ..\html\*.o
-erase ..\png\*.o -erase ..\png\*.o
-erase ..\png\*.bak
-erase ..\zlib\*.o -erase ..\zlib\*.o
-erase ..\zlib\*.bak
-erase ..\jpeg\*.o -erase ..\jpeg\*.o
-erase ..\..\lib\libwx.a -erase ..\..\lib\libwx.a

5
src/msw/makefile.sc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 00:42, 1999/07/27 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
# Symantec C++ makefile for the msw objects # Symantec C++ makefile for the msw objects
@@ -103,6 +103,7 @@ COMMONOBJS = \
$(COMMDIR)\sckipc.obj \ $(COMMDIR)\sckipc.obj \
$(COMMDIR)\sckstrm.obj \ $(COMMDIR)\sckstrm.obj \
$(COMMDIR)\socket.obj \ $(COMMDIR)\socket.obj \
$(COMMDIR)\strconv.obj \
$(COMMDIR)\stream.obj \ $(COMMDIR)\stream.obj \
$(COMMDIR)\string.obj \ $(COMMDIR)\string.obj \
$(COMMDIR)\tbarbase.obj \ $(COMMDIR)\tbarbase.obj \
@@ -124,7 +125,7 @@ COMMONOBJS = \
$(COMMDIR)\wincmn.obj \ $(COMMDIR)\wincmn.obj \
$(COMMDIR)\wxchar.obj \ $(COMMDIR)\wxchar.obj \
$(COMMDIR)\wxexpr.obj \ $(COMMDIR)\wxexpr.obj \
$(COMMDIR)\zipstream.obj \ $(COMMDIR)\zipstrm.obj \
$(COMMDIR)\zstream.obj $(COMMDIR)\zstream.obj
MSWOBJS = $(MSWDIR)\accel.obj \ MSWOBJS = $(MSWDIR)\accel.obj \

7
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 09:32, 1999/08/04 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc # File: makefile.vc
@@ -170,6 +170,7 @@ COMMONOBJS = \
..\common\$D\sckipc.obj \ ..\common\$D\sckipc.obj \
..\common\$D\sckstrm.obj \ ..\common\$D\sckstrm.obj \
..\common\$D\socket.obj \ ..\common\$D\socket.obj \
..\common\$D\strconv.obj \
..\common\$D\stream.obj \ ..\common\$D\stream.obj \
..\common\$D\string.obj \ ..\common\$D\string.obj \
..\common\$D\tbarbase.obj \ ..\common\$D\tbarbase.obj \
@@ -190,7 +191,7 @@ COMMONOBJS = \
..\common\$D\wincmn.obj \ ..\common\$D\wincmn.obj \
..\common\$D\wxchar.obj \ ..\common\$D\wxchar.obj \
..\common\$D\wxexpr.obj \ ..\common\$D\wxexpr.obj \
..\common\$D\zipstream.obj \ ..\common\$D\zipstrm.obj \
..\common\$D\zstream.obj ..\common\$D\zstream.obj
MSWOBJS = ..\msw\$D\accel.obj \ MSWOBJS = ..\msw\$D\accel.obj \
@@ -305,7 +306,7 @@ HTMLOBJS = \
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
# Add $(HTMLOBJS) if wanting wxHTML classes # Add $(HTMLOBJS) if wanting wxHTML classes
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
# Normal, static library # Normal, static library
all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)

13
src/msw/makefile.wat
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 00:42, 1999/07/27 # This file was automatically generated by tmake at 23:37, 1999/08/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#!/binb/wmake.exe #!/binb/wmake.exe
@@ -53,7 +53,8 @@ GENERICOBJS= busyinfo.obj &
# These are generic things that don't need to be compiled on MSW, # These are generic things that don't need to be compiled on MSW,
# but sometimes it's useful to do so for testing purposes. # but sometimes it's useful to do so for testing purposes.
NONESSENTIALOBJS= colrdlgg.obj & NONESSENTIALOBJS= caret.obj &
colrdlgg.obj &
dirdlgg.obj & dirdlgg.obj &
fontdlgg.obj & fontdlgg.obj &
helpxlp.obj & helpxlp.obj &
@@ -122,6 +123,7 @@ COMMONOBJS = &
sckipc.obj & sckipc.obj &
sckstrm.obj & sckstrm.obj &
socket.obj & socket.obj &
strconv.obj &
stream.obj & stream.obj &
string.obj & string.obj &
tbarbase.obj & tbarbase.obj &
@@ -143,7 +145,7 @@ COMMONOBJS = &
wincmn.obj & wincmn.obj &
wxchar.obj & wxchar.obj &
wxexpr.obj & wxexpr.obj &
zipstream.obj & zipstrm.obj &
zstream.obj zstream.obj
MSWOBJS = accel.obj & MSWOBJS = accel.obj &
@@ -698,6 +700,9 @@ sckstrm.obj: $(COMMDIR)\sckstrm.cpp
socket.obj: $(COMMDIR)\socket.cpp socket.obj: $(COMMDIR)\socket.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
strconv.obj: $(COMMDIR)\strconv.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
stream.obj: $(COMMDIR)\stream.cpp stream.obj: $(COMMDIR)\stream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -761,7 +766,7 @@ wxchar.obj: $(COMMDIR)\wxchar.cpp
wxexpr.obj: $(COMMDIR)\wxexpr.cpp wxexpr.obj: $(COMMDIR)\wxexpr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
zipstream.obj: $(COMMDIR)\zipstream.cpp zipstrm.obj: $(COMMDIR)\zipstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
zstream.obj: $(COMMDIR)\zstream.cpp zstream.obj: $(COMMDIR)\zstream.cpp