From 121631514cbbc98ecb45bd86a5bce081754cdbba Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 10 Jul 2023 19:37:21 +0200
Subject: [PATCH] Fix building non-GUI samples out of tree

Define wxUSE_GUI=0 for them.
---
 build/bakefiles/common_samples_outoftree.bkl | 6 ++++--
 samples/console/makefile.unx                 | 4 ++--
 samples/ipc/makefile.unx                     | 4 ++--
 samples/sockets/makefile.unx                 | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/bakefiles/common_samples_outoftree.bkl b/build/bakefiles/common_samples_outoftree.bkl
index fd008c3f8d..00dc52e4d6 100644
--- a/build/bakefiles/common_samples_outoftree.bkl
+++ b/build/bakefiles/common_samples_outoftree.bkl
@@ -37,9 +37,11 @@
     </define-rule>
 
 
-    <!-- empty stubs for things that don't make sense for makefile.unx: -->
+    <!-- Define templates used by the samples -->
     <template id="wx_append"/>
-    <template id="wx_append_base"/>
+    <template id="wx_append_base">
+        <cxxflags>-DwxUSE_GUI=0</cxxflags>
+    </template>
 
     <define-rule name="wx-data" pseudo="1">
         <define-tag name="files"/>
diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx
index 399de9a3df..9bfb520d8b 100644
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@@ -50,8 +50,8 @@ WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
 WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
 WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
 	--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-CONSOLE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
-	$(CXXFLAGS)
+CONSOLE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 CONSOLE_OBJECTS =  \
 	console_console.o
 
diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx
index fe79a595a0..547691373f 100644
--- a/samples/ipc/makefile.unx
+++ b/samples/ipc/makefile.unx
@@ -59,11 +59,11 @@ IPCSERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
 IPCSERVER_OBJECTS =  \
 	ipcserver_server.o
 BASEIPCCLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
-	$(CPPFLAGS) $(CXXFLAGS)
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 BASEIPCCLIENT_OBJECTS =  \
 	baseipcclient_baseclient.o
 BASEIPCSERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
-	$(CPPFLAGS) $(CXXFLAGS)
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 BASEIPCSERVER_OBJECTS =  \
 	baseipcserver_baseserver.o
 
diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index e07eb979ce..fe4b6a782c 100644
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -59,11 +59,11 @@ SERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
 SERVER_OBJECTS =  \
 	server_server.o
 BASECLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
-	$(CPPFLAGS) $(CXXFLAGS)
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 BASECLIENT_OBJECTS =  \
 	baseclient_baseclient.o
 BASESERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
-	$(CPPFLAGS) $(CXXFLAGS)
+	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 BASESERVER_OBJECTS =  \
 	baseserver_baseserver.o