From be14bbe80cef8ff2e04daa2b6231dffb44234bbc Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 28 Jun 2025 15:42:17 +1000
Subject: [PATCH] Really try to fix builds

---
 .github/workflows/build_freebsd.yml |  4 ++--
 .github/workflows/build_rpi.yml     | 22 ++++++++++++----------
 src/Certs.c                         |  6 ++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_freebsd.yml b/.github/workflows/build_freebsd.yml
index 031c0dcea..cbbe04ec7 100644
--- a/.github/workflows/build_freebsd.yml
+++ b/.github/workflows/build_freebsd.yml
@@ -25,8 +25,8 @@ jobs:
 
       - name: Retrieve OpenGL and X11 dev files (64 bit)
         run: |
-          mkdir src/freebsd64
-          cd src/freebsd64
+          mkdir freebsd64
+          cd freebsd64
           wget https://github.com/ClassiCube/rpi-compiling-stuff/raw/main/freebsd64.zip
           unzip freebsd64.zip
 
diff --git a/.github/workflows/build_rpi.yml b/.github/workflows/build_rpi.yml
index c9f0f2e6e..dd53307aa 100644
--- a/.github/workflows/build_rpi.yml
+++ b/.github/workflows/build_rpi.yml
@@ -25,21 +25,22 @@ jobs:
 
       - name: Retrieve OpenGL and X11 dev files
         run: |
-          mkdir src/rpi
-          cd src/rpi
+          mkdir rpi
+          cd rpi
           wget https://github.com/ClassiCube/rpi-compiling-stuff/raw/main/rpi32.zip
           unzip rpi32.zip
 
       - name: Compile RPI 32 bit build
         id: compile
         env: 
-          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror"
+          LIBS: "-lGLESv2 -lEGL -lX11 -lXi -lm -lpthread -ldl -lrt"
+          SRCS: "src/*.c third_party/bearssl/src/*.c"
+          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror -Ithird_party/bearssl/inc"
           RPI32_FLAGS: "-fvisibility=hidden -rdynamic -DCC_BUILD_RPI -I rpi/include -L rpi/lib -Wl,--unresolved-symbols=ignore-in-shared-libs"
         run: |
           LATEST_FLAG=-DCC_COMMIT_SHA=\"$GITHUB_SHA\"
           
-          cd src
-          $CC *.c ${{ env.COMMON_FLAGS }} ${{ env.RPI32_FLAGS }} $LATEST_FLAG -o cc-rpi32 -lGLESv2 -lEGL -lX11 -lXi -lm -lpthread -ldl -lrt
+          $CC ${{ env.SRCS }} ${{ env.COMMON_FLAGS }} ${{ env.RPI32_FLAGS }} $LATEST_FLAG -o cc-rpi32 ${{ env.LIBS }}
 
 
       - uses: ./.github/actions/notify_failure
@@ -76,21 +77,22 @@ jobs:
 
       - name: Retrieve OpenGL and X11 dev files
         run: |
-          mkdir src/rpi
-          cd src/rpi
+          mkdir rpi
+          cd rpi
           wget https://github.com/ClassiCube/rpi-compiling-stuff/raw/main/rpi64.zip
           unzip rpi64.zip     
 
       - name: Compile RPI 64 bit build
         id: compile
         env: 
-          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror"
+          LIBS: "-lGLESv2 -lEGL -lX11 -lXi -lm -lpthread -ldl -lrt"
+          SRCS: "src/*.c third_party/bearssl/src/*.c"
+          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror -Ithird_party/bearssl/inc"
           RPI64_FLAGS: "-fvisibility=hidden -rdynamic -DCC_BUILD_RPI -I rpi/include -L rpi/lib -Wl,--unresolved-symbols=ignore-in-shared-libs"
         run: |
           LATEST_FLAG=-DCC_COMMIT_SHA=\"$GITHUB_SHA\"
           
-          cd src
-          $CC *.c ${{ env.COMMON_FLAGS }} ${{ env.RPI64_FLAGS }} $LATEST_FLAG -o cc-rpi64 -lGLESv2 -lEGL -lX11 -lXi -lm -lpthread -ldl -lrt
+          $CC ${{ env.SRCS }} ${{ env.COMMON_FLAGS }} ${{ env.RPI64_FLAGS }} $LATEST_FLAG -o cc-rpi64 ${{ env.LIBS }}
 
 
       - uses: ./.github/actions/notify_failure
diff --git a/src/Certs.c b/src/Certs.c
index b2e485949..dd384ea92 100644
--- a/src/Certs.c
+++ b/src/Certs.c
@@ -1,18 +1,16 @@
 #include "Certs.h"
 
 #ifndef CC_CRT_BACKEND
+#include "Errors.h"
+
 void CertsBackend_Init(void) { }
 
 void Certs_BeginChain(struct X509CertContext* ctx) { }
-
 void Certs_FreeChain( struct X509CertContext* ctx) { }
-
 int Certs_VerifyChain(struct X509CertContext* ctx) { return ERR_NOT_SUPPORTED; }
 
 void Certs_BeginCert( struct X509CertContext* ctx, int size) { }
-
 void Certs_AppendCert(struct X509CertContext* ctx, const void* data, int len) { }
-
 void Certs_FinishCert(struct X509CertContext* ctx) { }
 #else
 #include "Platform.h"