Skip to content

Commit f71a4c2

Browse files
committed
cleanup diff, replace all WINE with WIBO
1 parent 9e48d33 commit f71a4c2

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

backend/compilers/download.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,6 @@ def download_ps1():
581581
"4.6": "2.95.2",
582582
}
583583

584-
compilers_path = COMPILERS_DIR / "psyq-compilers"
585-
586584
for version in psyq_to_gcc.keys():
587585
dest = COMPILERS_DIR / f"psyq{version}"
588586
if not dest.exists():

backend/coreapp/compilers.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,37 +369,37 @@ def preset_from_name(name: str) -> Optional[Preset]:
369369
EE_GCC29_991111 = GCCCompiler(
370370
id="ee-gcc2.9-991111",
371371
platform=PS2,
372-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.9-ee-991111/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
372+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.9-ee-991111/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
373373
)
374374

375375
EE_GCC2952_273A = GCCCompiler(
376376
id="ee-gcc2.95.2-273a",
377377
platform=PS2,
378-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.2/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
378+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.2/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
379379
)
380380

381381
EE_GCC2952_274 = GCCCompiler(
382382
id="ee-gcc2.95.2-274",
383383
platform=PS2,
384-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.2/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
384+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.2/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
385385
)
386386

387387
EE_GCC2953_107 = GCCCompiler(
388388
id="ee-gcc2.95.3-107",
389389
platform=PS2,
390-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
390+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
391391
)
392392

393393
EE_GCC2953_114 = GCCCompiler(
394394
id="ee-gcc2.95.3-114",
395395
platform=PS2,
396-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
396+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
397397
)
398398

399399
EE_GCC2953_136 = GCCCompiler(
400400
id="ee-gcc2.95.3-136",
401401
platform=PS2,
402-
cc='${WINE} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
402+
cc='${WIBO} "${COMPILER_DIR}/bin/ee-gcc.exe" -c -B "${COMPILER_DIR}"/lib/gcc-lib/ee/2.95.3/ $COMPILER_FLAGS "$INPUT" -o "$OUTPUT"',
403403
)
404404

405405
EE_GCC296 = GCCCompiler(
@@ -417,31 +417,31 @@ def preset_from_name(name: str) -> Optional[Preset]:
417417
MWCPS2_23_991202 = MWCCCompiler(
418418
id="mwcps2-2.3-991202",
419419
platform=PS2,
420-
cc='${WINE} "${COMPILER_DIR}/mwccmips.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
420+
cc='${WIBO} "${COMPILER_DIR}/mwccmips.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
421421
)
422422

423423
MWCPS2_30B22_011126 = MWCCCompiler(
424424
id="mwcps2-3.0b22-011126",
425425
platform=PS2,
426-
cc='${WINE} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
426+
cc='${WIBO} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
427427
)
428428

429429
MWCPS2_30B22_020123 = MWCCCompiler(
430430
id="mwcps2-3.0b22-020123",
431431
platform=PS2,
432-
cc='${WINE} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
432+
cc='${WIBO} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
433433
)
434434

435435
MWCPS2_30B22_020716 = MWCCCompiler(
436436
id="mwcps2-3.0b22-020716",
437437
platform=PS2,
438-
cc='${WINE} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
438+
cc='${WIBO} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
439439
)
440440

441441
MWCPS2_30B22_020926 = MWCCCompiler(
442442
id="mwcps2-3.0b22-020926",
443443
platform=PS2,
444-
cc='${WINE} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
444+
cc='${WIBO} "${COMPILER_DIR}/mwccps2.exe" -c $COMPILER_FLAGS -nostdinc -stderr "$INPUT" -o "$OUTPUT"',
445445
)
446446

447447
# IRIX
@@ -751,7 +751,7 @@ def preset_from_name(name: str) -> Optional[Preset]:
751751
)
752752

753753
# NDS_ARM9
754-
MWCCARM_CC = '${WIBO} "${COMPILER_DIR}/mwccarm.exe" -c -pragma "msg_show_realref off" -proc arm946e -nostdinc -stderr ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}"'
754+
MWCCARM_CC = '${WIBO} "${COMPILER_DIR}/mwccarm.exe" -pragma "msg_show_realref off" -c -proc arm946e -nostdinc -stderr ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}"'
755755

756756
MWCC_20_72 = MWCCCompiler(
757757
id="mwcc_20_72",

0 commit comments

Comments
 (0)