From 65777ed7faf8995c803a1b32d9666a1c8eee0dc5 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 24 Mar 2024 20:21:27 -0400 Subject: [PATCH] Used GitHub-hosted build dependencies --- .devcontainer/onCreate.sh | 4 ++-- .github/workflows/build.yml | 4 ++-- INSTALL.md | 4 ++-- Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 803ca410..590ddfb5 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -6,7 +6,7 @@ WORKSPACE="$1" cd /tmp if [ ! -d "$WORKSPACE/tools/mwccarm" ]; then - wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip + wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip unzip mwccarm.zip mv -v mwccarm "$WORKSPACE/tools" fi @@ -15,7 +15,7 @@ if [ ! -d "$WORKSPACE/tools/bin" \ -o ! -f "$WORKSPACE/sub/ARM7-TS.lcf.template" \ -o ! -f "$WORKSPACE/ARM9-TS.lcf.template" \ -o ! -f "$WORKSPACE/mwldarm.response.template" ]; then - wget https://cdn.discordapp.com/attachments/698589325620936736/722822401963851797/NitroSDK-3_2-060901.7z + wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z 7z x NitroSDK-3_2-060901.7z rm -rf "$WORKSPACE/tools/bin" mv -v NitroSDK-3_2-060901/tools/bin "$WORKSPACE/tools" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b1d384b..6e2b1a1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,8 +41,8 @@ jobs: run: | mkdir -p ~/download cd ~/download - wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip - wget https://cdn.discordapp.com/attachments/855279572651868170/875195363261292604/NitroSDK-4_2-071210-jp.7z + wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip + wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z unzip mwccarm.zip mv mwccarm $GITHUB_WORKSPACE/tools 7z x NitroSDK-4_2-071210-jp.7z diff --git a/INSTALL.md b/INSTALL.md index 9de4fe71..7e605f83 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -11,9 +11,9 @@ To install the compiler and SDK needed for this project, run `make install_toolc If you have issues with the `make` command above, you can also install the compiler and SDK manually. ### Manual installation -The build system requires the use of the Metrowerks C Compiler versions 2.0/sp2p2 to compile matching files. Join the pret Discord, download the pinned `mwccarm.zip` zip in `#pokediamond`, and extract it to `tools/`. At the end of this operation, you should have the file `tools/mwccarm/2.0/sp2p2/mwccarm.exe`. +The build system requires the use of the Metrowerks C Compiler versions 2.0/sp2p2 to compile matching files. Download [mwccarm.zip](https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip), and extract it to `tools/`. At the end of this operation, you should have the file `tools/mwccarm/2.0/sp2p2/mwccarm.exe`. -For Nitro SDK, download the `NitroSDK-4_2-071210-jp.7z` file pinned in the pret Discord in `#pokeheartgold`. Extract and copy the folder `tools/bin` from the Nitro SDK into the folder `tools` in your `pmd-sky` clone. At the end of this operation, you should have the file `tools/bin/makelcf.exe` inside your `pmd-sky` clone. Finally, copy `include/nitro/specfiles/ARM7-TS.lcf.template` into the subdirectory `sub`, and `include/nitro/specfiles/ARM9-TS.lcf.template` and `include/nitro/specfiles/mwldarm.response.template` into the project root. +For Nitro SDK, download [NitroSDK-4_2-071210-jp.7z](https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z). Extract and copy the folder `tools/bin` from the Nitro SDK into the folder `tools` in your `pmd-sky` clone. At the end of this operation, you should have the file `tools/bin/makelcf.exe` inside your `pmd-sky` clone. Finally, copy `include/nitro/specfiles/ARM7-TS.lcf.template` into the subdirectory `sub`, and `include/nitro/specfiles/ARM9-TS.lcf.template` and `include/nitro/specfiles/mwldarm.response.template` into the project root. ## 2. Dependencies diff --git a/Makefile b/Makefile index a2c96526..31305af2 100644 --- a/Makefile +++ b/Makefile @@ -73,8 +73,8 @@ compare: @$(MAKE) COMPARE=1 install_toolchain: rm -rf toolchain_tmp mkdir -p toolchain_tmp - wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip -O toolchain_tmp/mwccarm.zip - wget https://cdn.discordapp.com/attachments/855279572651868170/875195363261292604/NitroSDK-4_2-071210-jp.7z -O toolchain_tmp/NitroSDK-4_2-071210-jp.7z + wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip -O toolchain_tmp/mwccarm.zip + wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z -O toolchain_tmp/NitroSDK-4_2-071210-jp.7z unzip -o toolchain_tmp/mwccarm.zip -d tools 7z x toolchain_tmp/NitroSDK-4_2-071210-jp.7z -otoolchain_tmp/nitro_sdk -y mv toolchain_tmp/nitro_sdk/tools/bin/* tools/bin