Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / samples / sockets / sockets.bkl

diff --git a/samples/sockets/sockets.bkl b/samples/sockets/sockets.bkl
index 27bd0bc01e63b0d45924adc2d4ef15c2faa86f00..76c543168d48ed449d713d0932d9fa959d54b89d 100644 (file)
--- a/samples/sockets/sockets.bkl
+++ b/samples/sockets/sockets.bkl
@@ -3,18 +3,40 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
 
     <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>
         <sources>client.cpp</sources>
         <wx-lib>core</wx-lib>

+        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>client.rc</win32-res>

     </exe>
 
     </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>
         <sources>server.cpp</sources>
         <wx-lib>core</wx-lib>

+        <wx-lib>net</wx-lib>
+        <wx-lib>base</wx-lib>
+    </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>
         <wx-lib>base</wx-lib>

-        <win32-res>server.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>