From 83cc2a41281ce827ec57625a1641610681546629 Mon Sep 17 00:00:00 2001 From: Mark Street Date: Wed, 15 Nov 2023 07:49:21 +0000 Subject: [PATCH] Add gcc 2.5.7 for ps1 --- backend/Dockerfile | 13 +++++-------- backend/compilers/compilers.linux.yaml | 1 + backend/coreapp/compilers.py | 9 ++++++++- frontend/src/lib/i18n/locales/en/compilers.json | 1 + 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 8dce99788..1972610cc 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -65,6 +65,10 @@ COPY --from=nsjail /nsjail/nsjail /bin/nsjail COPY --from=ghcr.io/decompals/wibo:0.6.8 /usr/local/sbin/wibo /usr/bin/ +RUN add-apt-repository -y ppa:dosemu2/ppa && \ + apt-get update && \ + apt-get install -y dosemu2 + # windows compilers need i386 wine ARG ENABLE_MSDOS_SUPPORT @@ -78,14 +82,6 @@ RUN if [ "${ENABLE_MSDOS_SUPPORT}" = "YES" ] || \ wine; \ fi -ARG ENABLE_SATURN_SUPPORT -# install dosemu2 for saturn -RUN if [ "${ENABLE_SATURN_SUPPORT}" = "YES" ]; then \ - add-apt-repository -y ppa:dosemu2/ppa && \ - apt-get update && \ - apt-get install -y dosemu2; \ - fi - # msdos specific RUN if [ "${ENABLE_MSDOS_SUPPORT}" = "YES" ]; then \ wget "https://github.com/OmniBlade/binutils-gdb/releases/download/omf-build/omftools.tar.gz" && \ @@ -127,6 +123,7 @@ ARG ENABLE_N3DS_SUPPORT ARG ENABLE_N64_SUPPORT ARG ENABLE_NDS_ARM9_SUPPORT ARG ENABLE_PS1_SUPPORT +ARG ENABLE_SATURN_SUPPORT ARG ENABLE_SWITCH_SUPPORT ENV ENABLE_GBA_SUPPORT=${ENABLE_GBA_SUPPORT} diff --git a/backend/compilers/compilers.linux.yaml b/backend/compilers/compilers.linux.yaml index a55fb0c8c..6f37d7fed 100644 --- a/backend/compilers/compilers.linux.yaml +++ b/backend/compilers/compilers.linux.yaml @@ -92,6 +92,7 @@ ps1: - psyq4.4 - psyq4.5 - psyq4.6 + - gcc2.5.7-psx - gcc2.6.3-psx - gcc2.6.0-mipsel - gcc2.6.3-mipsel diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py index f1cc2999e..b5d53921a 100644 --- a/backend/coreapp/compilers.py +++ b/backend/coreapp/compilers.py @@ -349,7 +349,13 @@ def available_platforms() -> List[Platform]: PS1_GCC = ( 'cpp -E -lang-c -nostdinc "${INPUT}" -o "${INPUT}".i && ' - '${COMPILER_DIR}/gcc -c -pipe -B${COMPILER_DIR}/ ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}.i"' + '${COMPILER_DIR}/gcc -c -B${COMPILER_DIR}/ ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}.i"' +) + +GCC257_PSX = GCCPS1Compiler( + id="gcc2.5.7-psx", + platform=PS1, + cc=PS1_GCC, ) GCC263_PSX = GCCPS1Compiler( @@ -1180,6 +1186,7 @@ def available_platforms() -> List[Platform]: PSYQ44, PSYQ45, PSYQ46, + GCC257_PSX, GCC263_PSX, GCC260_MIPSEL, GCC263_MIPSEL, diff --git a/frontend/src/lib/i18n/locales/en/compilers.json b/frontend/src/lib/i18n/locales/en/compilers.json index e62522028..2eee4b948 100644 --- a/frontend/src/lib/i18n/locales/en/compilers.json +++ b/frontend/src/lib/i18n/locales/en/compilers.json @@ -122,6 +122,7 @@ "gcc-5026-cpp": "GCC 4.0.0 (Xcode 2.1) (C++)", "gcc3-1041": "GCC 3.1 (Mac OS 10.1.4) (C)", + "gcc2.5.7-psx": "gcc 2.5.7-psx + maspsx", "gcc2.6.3-psx": "gcc 2.6.3-psx + maspsx", "gcc2.6.0-mipsel": "gcc 2.6.0 + maspsx", "gcc2.6.3-mipsel": "gcc 2.6.3 + maspsx",