Skip to content
Snippets Groups Projects
Commit bcebde9c authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Actually, everything but gtkchat appears to link with libsbbs.so

parent 7803219d
Branches
Tags
1 merge request!455Update branch with changes from master
...@@ -496,14 +496,17 @@ spec: ...@@ -496,14 +496,17 @@ spec:
- touch xpdev - touch xpdev
- touch xpdev-mt - touch xpdev-mt
- touch smblib - touch smblib
- touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
- "src/sbbs3/gtkmonitor/*.exe.release/*" - "src/sbbs3/gtkmonitor/*.exe.release/*"
needs: needs:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
rules: rules:
- if: '"$[[ inputs.has_gtk ]]" == "no"' - if: '"$[[ inputs.has_gtk ]]" == "no"'
when: never when: never
...@@ -518,14 +521,17 @@ spec: ...@@ -518,14 +521,17 @@ spec:
- touch xpdev - touch xpdev
- touch xpdev-mt - touch xpdev-mt
- touch smblib - touch smblib
- touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
- "src/sbbs3/gtkuseredit/*.exe.release/*" - "src/sbbs3/gtkuseredit/*.exe.release/*"
needs: needs:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
rules: rules:
- if: '"$[[ inputs.has_gtk ]]" == "no"' - if: '"$[[ inputs.has_gtk ]]" == "no"'
when: never when: never
...@@ -540,14 +546,17 @@ spec: ...@@ -540,14 +546,17 @@ spec:
- touch xpdev - touch xpdev
- touch xpdev-mt - touch xpdev-mt
- touch smblib - touch smblib
- touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
- "src/sbbs3/gtkuserlist/*.exe.release/*" - "src/sbbs3/gtkuserlist/*.exe.release/*"
needs: needs:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
rules: rules:
- if: '"$[[ inputs.has_gtk ]]" == "no"' - if: '"$[[ inputs.has_gtk ]]" == "no"'
when: never when: never
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
// Disable it here since we don't need the sbbs_t bits
#undef USE_CRYPTLIB
#include "sbbs.h" #include "sbbs.h"
#define USE_CRYPTLIB
struct gtkmonitor_config { struct gtkmonitor_config {
char view_stdout[MAX_PATH+1]; /* %f | xmessage -file - */ char view_stdout[MAX_PATH+1]; /* %f | xmessage -file - */
......
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#undef USE_CRYPTLIB
#include "sbbs.h" #include "sbbs.h"
#define USE_CRYPTLIB
#include "dirwrap.h" #include "dirwrap.h"
#include "xpbeep.h" #include "xpbeep.h"
#include "datewrap.h" #include "datewrap.h"
......
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#undef USE_CRYPTLIB
#include "sbbs.h" #include "sbbs.h"
#define USE_CRYPTLIB
#include "dirwrap.h" #include "dirwrap.h"
#include "events.h" #include "events.h"
......
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#undef USE_CRYPTLIB
#include "sbbs.h" #include "sbbs.h"
#define USE_CRYPTLIB
extern GtkBuilder *builder; extern GtkBuilder *builder;
extern scfg_t cfg; extern scfg_t cfg;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment