From 7dc6db8b3f7df27a4d5f3b06d93aa5d6a8c65bc9 Mon Sep 17 00:00:00 2001
From: octospacc <octo@tutamail.com>
Date: Sat, 15 Feb 2025 15:47:39 +0100
Subject: [PATCH] Some build fixes

---
 .gitlab-ci.yml                               |   5 ++++-
 LibMultiSpacc/Examples/Common.mk             |   2 +-
 LibMultiSpacc/Examples/HelloWorld/CHARS2.png | Bin 0 -> 773 bytes
 LibMultiSpacc/LibMultiSpacc/MultiSpacc.h     |   7 +++++++
 Tools/InstallBuildEnvironment.sh             |   2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 LibMultiSpacc/Examples/HelloWorld/CHARS2.png

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dc8a9e..b821405 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,15 @@
 image: debian:latest
 
 before_script: |
-  bash ./Tools/InstallBuildEnvironment.sh
+  sh ./Tools/InstallBuildEnvironment.sh
 
 Tests:
   stage: build
   script: |
     source .env
     make -j$(nproc --all)
+  artifacts:
+    paths:
+      - LibMultiSpacc/Examples/
   rules:
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
diff --git a/LibMultiSpacc/Examples/Common.mk b/LibMultiSpacc/Examples/Common.mk
index c102140..5da0c20 100644
--- a/LibMultiSpacc/Examples/Common.mk
+++ b/LibMultiSpacc/Examples/Common.mk
@@ -131,7 +131,7 @@ else
 	BuildDir = ./Build/$(BuildProcess)
 endif
 
-# TODO: Fix include substitutions properly in this, and make all custom build processes lest wasteful of operations
+# TODO: Fix include substitutions properly in this, and make all custom build processes less wasteful of operations
 define PrepareTargetBuildDir
 	mkdir -p $(BuildDir)/.tmp $(BuildDirSources)/.tmp
 
diff --git a/LibMultiSpacc/Examples/HelloWorld/CHARS2.png b/LibMultiSpacc/Examples/HelloWorld/CHARS2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7b9c364e773712c994df845fb475977000d45cd
GIT binary patch
literal 773
zcmeAS@N?(olHy`uVBq!ia0vp^4Gav73{1>G7Tfe`CP0d@ILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmFKt5-HPl)S(hW|hS<gM6$6l4@<fk$L90|Vay5N6D}*2&4hz|`vL;uw-~
z@9mV>zQ+mzEwcsp2(R4fzkUky7S)>hmcPPG)y|#Cd360^S5Z>pk302w0uxi_fBMx_
zH1+$cpG-UM>oItXA9!2G7{fNx$L?OteDUl57xi~{w+0=L&C(5eblIj>#=arv=)17B
z1%i*+lNg`e+T*oVdfG*quUjUv1?V2%ZK+o>!E{F6!-!+N{2Pj$KMOvH;p9%;b;x?s
z`>RabIYmyYPo2qn`#Xoh(XM@Z=NC_wK6E>G`;*<`e`XghYgv5e#vSR?jjqcbmvgA-
zs1;7-?O!o{_4{WYGY=eYWqk1@(AtMtv*0FE$J;RBSeG^X%4dZuMkqO6YrFRG#lt7s
z6Z%3jFO^9wZ%&gszd7dTnkT2V7DRDy-TZvN@Su0%sZ~Bcg6?Z&J_Jcl{&7Um_r0ut
z(dUS1%o7-MI?~=(Gl(*`@fDxlzOS6g`ho9uzXSUsE?j0h#$xin=b*c5QkcZYGfbf!
zI#O%4)uj}!e4Hzv-=cljT1x)f;w!~gH#s}p^A`vEJE$FyFXL)3YWT}Bso~eM7rgq%
zzpc#SN_X@rVc>P!Aj+N~sKW3}*5ROD@5LK-!U^w6F4iz9bAJ>3#Z$G}I^~VF>@t@8
z#Fz?&IeU-Ho5yhMAM=Clhn3%X1YEE+T)o2SxcNbwC~0P&9iJo~s^~u0cXz9ncH{O{
zkM7yTgfRK;W6tsYW!s=H_Cks4jIG-Np;)QLr2CWmI=`)wTQ219UCk~t+y7C^LGctB
zo@<-6K1(+AO-fi~#LRSi?}M4V%nSaVWIy2L$8dbr^p}U0b3dHfz*_U^jq0thg3RKT
zS}NKZMqgLG=~=E*BJ<P#SGwpl9H6e#<sZ{lpA`<j?`59?rcwq^S3j3^P6<r_S}ayZ

literal 0
HcmV?d00001

diff --git a/LibMultiSpacc/LibMultiSpacc/MultiSpacc.h b/LibMultiSpacc/LibMultiSpacc/MultiSpacc.h
index b96a60c..710cdcd 100644
--- a/LibMultiSpacc/LibMultiSpacc/MultiSpacc.h
+++ b/LibMultiSpacc/LibMultiSpacc/MultiSpacc.h
@@ -18,6 +18,13 @@ extern "C" {
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef MultiSpacc_Target_SDLCommon
+	#if defined(MultiSpacc_Target_SDL12) || defined(MultiSpacc_Target_SDL20)
+		#define MultiSpacc_Target_SDLCommon
+		#define MultiSpacc_Target_SDLCom // TODO deprecate
+	#endif
+#endif
+
 #ifdef MultiSpacc_Target_SDL12
 	#include <SDL/SDL.h>
 	#include <SDL/SDL_image.h>
diff --git a/Tools/InstallBuildEnvironment.sh b/Tools/InstallBuildEnvironment.sh
index 80c6422..f63e9b6 100644
--- a/Tools/InstallBuildEnvironment.sh
+++ b/Tools/InstallBuildEnvironment.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #[ "$(whoami)" != root ] && {
 	echo "This script must probably run as root".