From bcebde9c21397aea82cb13532f01dfdef08fa17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Wed, 7 Feb 2024 19:24:31 -0500
Subject: [PATCH] Actually, everything but gtkchat appears to link with
 libsbbs.so

---
 .gitlab-ci-unix.yml                 | 9 +++++++++
 src/sbbs3/gtkmonitor/gtkmonitor.h   | 4 ----
 src/sbbs3/gtkuseredit/events.c      | 3 ---
 src/sbbs3/gtkuseredit/gtkuseredit.c | 3 ---
 src/sbbs3/gtkuserlist/gtkuserlist.h | 3 ---
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci-unix.yml b/.gitlab-ci-unix.yml
index d57c558683..01c467dbc4 100644
--- a/.gitlab-ci-unix.yml
+++ b/.gitlab-ci-unix.yml
@@ -496,14 +496,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkmonitor/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
@@ -518,14 +521,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkuseredit/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
@@ -540,14 +546,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkuserlist/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
diff --git a/src/sbbs3/gtkmonitor/gtkmonitor.h b/src/sbbs3/gtkmonitor/gtkmonitor.h
index 3d44d824a1..b9f32bf902 100644
--- a/src/sbbs3/gtkmonitor/gtkmonitor.h
+++ b/src/sbbs3/gtkmonitor/gtkmonitor.h
@@ -3,11 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-// Disable it here since we don't need the sbbs_t bits
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 
 struct gtkmonitor_config {
 	char	view_stdout[MAX_PATH+1];	/* %f | xmessage -file - */
diff --git a/src/sbbs3/gtkuseredit/events.c b/src/sbbs3/gtkuseredit/events.c
index 066fdcf3d9..2e33d5ae95 100644
--- a/src/sbbs3/gtkuseredit/events.c
+++ b/src/sbbs3/gtkuseredit/events.c
@@ -1,9 +1,6 @@
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 #include "dirwrap.h"
 #include "xpbeep.h"
 #include "datewrap.h"
diff --git a/src/sbbs3/gtkuseredit/gtkuseredit.c b/src/sbbs3/gtkuseredit/gtkuseredit.c
index 12e9d3af1d..9f743bf91c 100644
--- a/src/sbbs3/gtkuseredit/gtkuseredit.c
+++ b/src/sbbs3/gtkuseredit/gtkuseredit.c
@@ -1,9 +1,6 @@
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 #include "dirwrap.h"
 
 #include "events.h"
diff --git a/src/sbbs3/gtkuserlist/gtkuserlist.h b/src/sbbs3/gtkuserlist/gtkuserlist.h
index fd307ac6af..245c43a1aa 100644
--- a/src/sbbs3/gtkuserlist/gtkuserlist.h
+++ b/src/sbbs3/gtkuserlist/gtkuserlist.h
@@ -3,10 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 
 extern GtkBuilder	*builder;
 extern scfg_t		cfg;
-- 
GitLab