Use makelcf from NitroSDK subproject

This commit is contained in:
Nomura 2024-08-07 10:21:46 +02:00
parent da85e6a6f8
commit 2137819bce
9 changed files with 16 additions and 13 deletions

View File

@ -23,7 +23,7 @@ jobs:
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources
sudo dpkg --add-architecture i386
sudo apt-get update -y
sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable binutils-arm-none-eabi gcc-arm-none-eabi
sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable binutils-arm-none-eabi gcc-arm-none-eabi flex bison
pip install --user meson pyelftools
- name: Checkout Repo

View File

@ -9,6 +9,8 @@ RUN apt-get install -y \
python3-venv \
python3-pip \
python-is-python3 \
flex \
bison \
binutils-arm-none-eabi \
gcc-arm-none-eabi \
wget

View File

@ -33,7 +33,7 @@ You now have the choice between two different environments to use to build the p
```
echo 'export PATH=${PATH}:/mingw64/bin' >> ~/.bashrc
source ~/.bashrc
pacman -S git meson gcc mingw-w64-x86_64-arm-none-eabi-{binutils,gcc}
pacman -S git meson gcc flex bison mingw-w64-x86_64-arm-none-eabi-{binutils,gcc}
```
Press 'Y' when prompted to confirm the installation.
@ -78,7 +78,7 @@ You now have the choice between two different environments to use to build the p
7. Certain packages are required to build the repository. Install these packages by running the following command:
```bash
sudo apt install git build-essential binutils-arm-none-eabi gcc-arm-none-eabi ninja-build
sudo apt install git flex bison build-essential binutils-arm-none-eabi gcc-arm-none-eabi ninja-build
```
We are not done yet, the 'meson' package is also necessary, but the version provided by apt is too outdated. To get the most recent meson version, run:
@ -117,6 +117,8 @@ You will also need the following packages:
* gcc (14.x.x)
* meson (>= 1.3.0)
* flex
* bison
* wine (to run the mwcc executables)
* libpng
* pkg-config
@ -147,6 +149,8 @@ Building the ROM requires the following packages. If you cannot find one or more
* git
* meson (>= 1.3.0)
* flex
* bison
* build-essentials (build-essential on Ubuntu)
* binutils-arm-none-eabi (arm-none-eabi-binutils on Arch Linux)
* gcc-arm-none-eabi (arm-none-eabi-gcc on Arch Linux)

View File

@ -66,13 +66,6 @@ link_args = [
'-sym', 'on'
]
############################################################
### TOOLS ###
############################################################
subdir('tools')
############################################################
### DEPENDENCIES ###
############################################################
@ -109,6 +102,12 @@ libsyscall_dep = dependency('libsyscall')
ppwlobby_dep = dependency('ppwlobby')
############################################################
### TOOLS ###
############################################################
subdir('tools')
############################################################
### SPEC FILES ###
############################################################

View File

@ -4,5 +4,4 @@ cpp = 'g++'
ar = 'ar'
makebanner = root + '/tools/maketools/makebanner.exe'
makelcf = root + '/tools/maketools/makelcf.exe'
makerom = root + '/tools/maketools/makerom.exe'

View File

@ -4,5 +4,4 @@ cpp = 'g++-14'
ar = 'ar'
makebanner = ['wine', root + '/tools/maketools/makebanner.exe']
makelcf = ['wine', root + '/tools/maketools/makelcf.exe']
makerom = ['wine', root + '/tools/maketools/makerom.exe']

View File

@ -4,5 +4,4 @@ cpp = 'g++'
ar = 'ar'
makebanner = ['wine', root + '/tools/maketools/makebanner.exe']
makelcf = ['wine', root + '/tools/maketools/makelcf.exe']
makerom = ['wine', root + '/tools/maketools/makerom.exe']

View File

@ -6,3 +6,4 @@ directory = NitroSDK-4.2.30001
[provide]
dependency_names = NitroSDK
program_names = makelcf

Binary file not shown.