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

Made wxSocket compile using makefiles; #ifdefed out <<, >> operators in stream.cpp

Browse Source 
for USE_SERIALL; included io.h for VC++ in socket.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-07 07:58:29 +00:00
parent d3904ceb9a
commit fcc6dddd1f
17 changed files with 206 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/wxsocket/client.rc
View File

@@ -1,3 +1,3 @@
mondrian ICON mondrian.ico
conn_icn ICON connect.ico
#include "wx.rc"
#include "wx/msw/wx.rc"

31
samples/wxsocket/makefile.nt
View File

@@ -7,21 +7,24 @@
# "%W% %G%"
#
# Makefile : Builds wxSock library for Windows NT / Win95
!include <..\..\..\src\ntwxwin.mak>
EXTRALIBS=wsock32.lib
!include <..\..\src\ntwxwin.mak>
# Change WXDIR or WXWIN to wherever wxWindows is found
#WXWIN = $(WX)
WXDIR = $(WXWIN)
WXINC = $(WXDIR)\include\msw
#WXDIR = $(WXWIN)
#WXINC = $(WXDIR)\include\msw
WXSOCKDIR = $(WXDIR)\contrib\wxsock
WXSOCKINC = $(WXSOCKDIR)
WXSOCKLIB = $(WXSOCKDIR)\lib\wxsock.lib $(WXSOCKDIR)\lib\zlib.lib
INC=-I$(WXBASEINC) -I$(WXINC) -I$(WXSOCKINC)
#WXSOCKDIR = $(WXDIR)\contrib\wxsock
#WXSOCKINC = $(WXSOCKDIR)
#WXSOCKLIB = $(WXSOCKDIR)\lib\wxsock.lib $(WXSOCKDIR)\lib\zlib.lib
WXLIB = $(WXDIR)\lib\wx.lib
LIBS=$(WXSOCKLIB) wsock32.lib $(LIBS)
#INC=-I$(WXBASEINC) -I$(WXINC) # -I$(WXSOCKINC)
#WXLIB = $(WXDIR)\lib\wx.lib
#LIBS=$(WXSOCKLIB) wsock32.lib $(LIBS)
#LIBS=$(WXSOCKLIB) wsock32.lib $(LIBS)
#LIBS=$(WXLIB) $(WXSTRINGLIB) oldnames libw llibcew llibce commdlg shell
all: client.exe server.exe
@@ -31,19 +34,19 @@ wx:
nmake -f makefile.nt
cd $(ITSYDIR)
client.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) $(WXSTRINGLIB) client.obj\
client.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) client.obj\
client.res
$(link) -out:client.exe $(LINKFLAGS) $(DUMMYOBJ) client.obj \
client.res $(LIBS)
server.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) $(WXSTRINGLIB) server.obj
server.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) server.obj
$(link) -out:server.exe $(LINKFLAGS) $(DUMMYOBJ) server.obj $(LIBS)
client.obj: client.$(SRCSUFF)
$(cc) $(CPPFLAGS2) /c /Tp $*.$(SRCSUFF)
client.res: client.rc $(WXDIR)\include\msw\wx.rc
$(rc) -r /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa -fo$@ client.rc
client.res: client.rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ client.rc
server.obj: server.$(SRCSUFF)

2
samples/wxsocket/server.rc
View File

@@ -1,4 +1,4 @@
mondrian ICON "mondrian.ico"
conn_icn ICON "connect.ico"
#include "wx.rc"
#include "wx/msw/wx.rc"