Comment memory-related preprocessor lines to fix compilation error

azihassan · Sep 6, 2024 · 8d37150 · 8d37150
1 parent 48c0390
commit 8d37150
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.github/workflows/dreamcast.yml b/.github/workflows/dreamcast.yml
@@ -38,14 +38,18 @@ 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 && \
           cd SDL-1.2 && \
           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
@@ -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