Skip to content

Add gcc 2.5.7 for ps1 #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethteck merged 1 commit into from
Nov 15, 2023
Merged

Add gcc 2.5.7 for ps1 #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" && \
Expand Down Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions backend/compilers/compilers.linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion backend/coreapp/compilers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -1180,6 +1186,7 @@ def available_platforms() -> List[Platform]:
PSYQ44,
PSYQ45,
PSYQ46,
GCC257_PSX,
GCC263_PSX,
GCC260_MIPSEL,
GCC263_MIPSEL,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/i18n/locales/en/compilers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down