more socket cleanup to allow using wxSocket from both wxBase and wxCore (replaces patch 1756260)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-19 16:45:08 +00:00
parent 4813bb8d72
commit 2804f77d88
54 changed files with 3817 additions and 1933 deletions

View File

@@ -3,7 +3,15 @@
<include file="../../build/bakefiles/common_samples.bkl"/>
<exe id="client" template="wx_sample" template_append="wx_append">
<if cond="FORMAT=='gnu'">
<!-- as we can't (easily) test for GUI, build them always -->
<set var="cond_build_gui">1</set>
</if>
<if cond="FORMAT!='gnu'">
<set var="cond_build_gui">USE_GUI=='1'</set>
</if>
<exe id="client" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">
<sources>client.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
@@ -11,7 +19,7 @@
<win32-res>client.rc</win32-res>
</exe>
<exe id="server" template="wx_sample" template_append="wx_append">
<exe id="server" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">
<sources>server.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
@@ -19,4 +27,18 @@
<win32-res>server.rc</win32-res>
</exe>
<exe id="baseclient" template="wx_sample_console"
template_append="wx_append_base">
<sources>baseclient.cpp</sources>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib>
</exe>
<exe id="baseserver" template="wx_sample_console"
template_append="wx_append_base">
<sources>baseserver.cpp</sources>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib>
</exe>
</makefile>