Add 1.2.5n compiler, and use it for melee/pikmin

decompme · Jul 15, 2023 · 75fc870 · 75fc870
1 parent f7c33ef
commit 75fc870
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/backend/compilers/download.py b/backend/compilers/download.py
@@ -786,6 +786,7 @@ def download_wii_gc():
  "1.1": "mwcc_233_159",
  "1.2.5": "mwcc_233_163",
  "1.2.5e": "mwcc_233_163e",
+ "1.2.5n": "mwcc_233_163n",
  "1.3.2": "mwcc_242_81",
  "2.0": "mwcc_247_92",
  "2.5": "mwcc_247_105",

diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py
@@ -740,6 +740,12 @@ def preset_from_name(name: str) -> Optional[Preset]:
  cc='${WINE} "${COMPILER_DIR}/mwcceppc.125.exe" -c -proc gekko -nostdinc -stderr ${COMPILER_FLAGS} -o "${OUTPUT}.1" "${INPUT}" && ${WINE} "${COMPILER_DIR}/mwcceppc.exe" -c -proc gekko -nostdinc -stderr ${COMPILER_FLAGS} -o "${OUTPUT}.2" "${INPUT}" && python3 "${COMPILER_DIR}/frank.py" "${OUTPUT}.1" "${OUTPUT}.2" "${OUTPUT}"',
 )
 
+MWCC_233_163N = MWCCCompiler(
+ id="mwcc_233_163n",
+ platform=GC_WII,
+ cc=MWCCEPPC_CC,
+)
+
 MWCC_242_81 = MWCCCompiler(
  id="mwcc_242_81",
  platform=GC_WII,
@@ -1103,6 +1109,7 @@ def preset_from_name(name: str) -> Optional[Preset]:
  MWCC_233_159,
  MWCC_233_163,
  MWCC_233_163E,
+ MWCC_233_163N,
  MWCC_242_81,
  MWCC_247_92,
  MWCC_247_105,
@@ -1441,12 +1448,12 @@ def preset_from_name(name: str) -> Optional[Preset]:
  ),
  Preset(
  "Pikmin",
- MWCC_233_163E,
+ MWCC_233_163N,
  "-lang=c++ -nodefaults -Cpp_exceptions off -RTTI on -fp hard -O4,p -common on",
  ),
  Preset(
  "Super Smash Bros. Melee",
- MWCC_233_163E,
+ MWCC_233_163N,
  "-O4,p -nodefaults -proc gekko -fp hard -Cpp_exceptions off -enum int -fp_contract on -inline auto -DM2CTX -DMUST_MATCH -DWIP",
  ),
  Preset(

diff --git a/frontend/src/lib/i18n/locales/en/compilers.json b/frontend/src/lib/i18n/locales/en/compilers.json
@@ -62,6 +62,7 @@
  "mwcc_233_159": "2.3.3 build 159 (GC MW 1.1)",
  "mwcc_233_163": "2.3.3 build 163 (GC MW 1.2.5)",
  "mwcc_233_163e": "2.3.3 build 163 (GC MW 1.2.5e)",
+ "mwcc_233_163n": "2.3.3 build 163 (GC MW 1.2.5n)",
  "mwcc_242_81": "2.4.2 build 81 (GC MW 1.3.2)",
  "mwcc_247_105": "2.4.7 build 105 (GC MW 2.5)",
  "mwcc_247_107": "2.4.7 build 107 (GC MW 2.6)",