From 8d37150e07004acc96a5d357c30d62c66df65591 Mon Sep 17 00:00:00 2001 From: Azi Hassan Date: Thu, 5 Sep 2024 21:49:49 +0100 Subject: [PATCH] Comment memory-related preprocessor lines to fix compilation error --- .github/workflows/dreamcast.yml | 6 +++++- SDL_stdinc.h.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 SDL_stdinc.h.patch diff --git a/.github/workflows/dreamcast.yml b/.github/workflows/dreamcast.yml index 7bd4c0e5d74..020a71b0dd2 100644 --- a/.github/workflows/dreamcast.yml +++ b/.github/workflows/dreamcast.yml @@ -38,6 +38,9 @@ jobs: cd /opt/toolchains/dc/kos-ports/SDL && \ make uninstall || echo 'SDL 1.2 uninstall finished with non zero status, proceding anyway' + #- name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + - name: Install GPF SDL 1.2 run: | git clone -b SDL-dreamhal--GLDC https://github.com/GPF/SDL-1.2 && \ @@ -45,7 +48,8 @@ jobs: source /opt/toolchains/dc/kos/environ.sh && \ make -f Makefile.dc && \ cp /opt/toolchains/dc/kos/addons/lib/dreamcast/libSDL.a /usr/lib/ && \ - cp include/* /usr/include/SDL/ + cp include/* /usr/include/SDL/ && \ + patch /usr/include/SDL/SDL_stdinc.h -l -p0 < ../SDL_stdinc.h.patch - name: Download spawn.mpq run: | diff --git a/SDL_stdinc.h.patch b/SDL_stdinc.h.patch new file mode 100644 index 00000000000..ce8e8529c4f --- /dev/null +++ b/SDL_stdinc.h.patch @@ -0,0 +1,12 @@ +--- include/SDL_stdinc.h ++++ /usr/include/SDL/SDL_stdinc.h +@@ -32,9 +32,9 @@ + + #include "SDL_config.h" + +-#if defined(__DREAMCAST__) +-#include "memfuncs.h" +-#endif ++//#if defined(__DREAMCAST__) ++//#include "memfuncs.h" ++//#endif