Skip to content

Commit

Permalink
Merge branch 'formatter' into tailwind
Browse files Browse the repository at this point in the history
  • Loading branch information
ethteck committed Dec 8, 2024
2 parents 4585670 + 8adcfb4 commit 3d55b72
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 5 additions & 5 deletions backend/coreapp/compilers.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ def available_platforms() -> List[Platform]:
# PS1
PSYQ_MSDOS_CC = (
'cpp -P "$INPUT" | unix2dos > object.oc && cp ${COMPILER_DIR}/* . && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -f ${COMPILER_DIR}/dosemurc -K . -E "CC1PSX.EXE -quiet ${COMPILER_FLAGS} -o object.os object.oc") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -f ${COMPILER_DIR}/dosemurc -K . -E "ASPSX.EXE -quiet object.os -o object.oo") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -K . -E "CC1PSX.EXE -quiet ${COMPILER_FLAGS} -o object.os object.oc") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -K . -E "ASPSX.EXE -quiet object.os -o object.oo") && '
'${COMPILER_DIR}/psyq-obj-parser object.oo -o "$OUTPUT"'
)

Expand Down Expand Up @@ -490,9 +490,9 @@ def available_platforms() -> List[Platform]:
SATURN_CC = (
'cat "$INPUT" | unix2dos > dos_src.c && '
"cp -r ${COMPILER_DIR}/* . && "
'(HOME="." /usr/bin/dosemu -quiet -dumb -f ${COMPILER_DIR}/dosemurc -K . -E "CPP.EXE dos_src.c -o src_proc.c") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -f ${COMPILER_DIR}/dosemurc -K . -E "CC1.EXE -quiet ${COMPILER_FLAGS} src_proc.c -o cc1_out.asm") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -f ${COMPILER_DIR}/dosemurc -K . -E "AS.EXE cc1_out.asm -o as_out.o") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -K . -E "CPP.EXE dos_src.c -o src_proc.c") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -K . -E "CC1.EXE -quiet ${COMPILER_FLAGS} src_proc.c -o cc1_out.asm") && '
'(HOME="." /usr/bin/dosemu -quiet -dumb -K . -E "AS.EXE cc1_out.asm -o as_out.o") && '
"sh-elf-objcopy -Icoff-sh -Oelf32-sh as_out.o && "
'cp as_out.o "$OUTPUT"'
)
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Diff/Diff.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
.rotation6 { color: rgb(82, 82, 205); } // hsv(240° 60% 80%)
.rotation7 { color: rgb(164, 82, 205); } // hsv(280° 60% 80%)
.rotation8 { color: rgb(205, 82, 164); } // hsv(320° 60% 80%)
.symbol { color: black }
}

.highlighted {
Expand Down

0 comments on commit 3d55b72

Please sign in to comment.