Compare commits

..

No commits in common. "master" and "v1.3.1" have entirely different histories.

3 changed files with 104 additions and 130 deletions

View File

@ -15,7 +15,7 @@ jobs:
- name: Create Build Environment - name: Create Build Environment
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential libgl1-mesa-dev libglvnd-dev cmake qt6-base-dev sudo apt-get install -y build-essential libgl1-mesa-dev and libglvnd-dev cmake qt6-base-dev
mkdir build mkdir build
- name: Configure CMake - name: Configure CMake
@ -51,54 +51,30 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: "6.7.2" version: '6.7.2'
- name: Install CMake - name: Install CMake
uses: lukka/get-cmake@latest uses: lukka/get-cmake@latest
- name: Create Build Environment - name: Create Build Environment
run: | run: |
mkdir -p build/x86_64 build/arm64 build/universal mkdir build
- name: Configure CMake (x86_64) - name: Configure CMake
working-directory: ${{ github.workspace }}/build/x86_64 working-directory: ${{github.workspace}}/build
shell: bash shell: bash
run: | run: |
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 ../.. cmake -DCMAKE_BUILD_TYPE=Release ..
- name: Configure CMake (arm64) - name: Build
working-directory: ${{ github.workspace }}/build/arm64 working-directory: ${{github.workspace}}/build
shell: bash
run: |
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 ../..
- name: Build (x86_64)
working-directory: ${{ github.workspace }}/build/x86_64
shell: bash shell: bash
run: | run: |
make -j4 make -j4
macdeployqt NDSFactory.app
- name: Build (arm64)
working-directory: ${{ github.workspace }}/build/arm64
shell: bash
run: |
make -j4
- name: Create Universal Binary
working-directory: ${{ github.workspace }}/build
shell: bash
run: |
cp -R x86_64/NDSFactory.app universal/
lipo -create -output universal/NDSFactory.app/Contents/MacOS/NDSFactory x86_64/NDSFactory.app/Contents/MacOS/NDSFactory arm64/NDSFactory.app/Contents/MacOS/NDSFactory
- name: Deploy Qt Frameworks
working-directory: ${{ github.workspace }}/build/universal
shell: bash
run: |
macdeployqt NDSFactory.app -verbose=1
- name: Archive Artifact - name: Archive Artifact
working-directory: ${{ github.workspace }}/build/universal working-directory: ${{github.workspace}}/build
shell: bash shell: bash
run: | run: |
zip -r NDSFactory-${{ github.ref_name }}-macOS.zip NDSFactory.app ../README.md ../LICENSE zip -r NDSFactory-${{ github.ref_name }}-macOS.zip NDSFactory.app ../README.md ../LICENSE
@ -107,7 +83,7 @@ jobs:
uses: softprops/action-gh-release@v2.0.8 uses: softprops/action-gh-release@v2.0.8
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
with: with:
files: "build/universal/NDSFactory-${{ github.ref_name }}-macOS.zip" files: "build/NDSFactory-${{ github.ref_name }}-macOS.zip"
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-latest
@ -118,7 +94,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: "6.7.2" version: '6.7.2'
- name: Install CMake - name: Install CMake
uses: lukka/get-cmake@latest uses: lukka/get-cmake@latest

View File

@ -52,7 +52,6 @@ In this tab, you can:
* extract the FAT files from fat_data.bin. * extract the FAT files from fat_data.bin.
* rebuild the FAT files into a new fat.bin and fat_data.bin. * rebuild the FAT files into a new fat.bin and fat_data.bin.
If the ROM contains ARM9/ARM7 overlays you must provide the original fat.bin to extract the overlay offsets. If the ROM contains ARM9/ARM7 overlays you must provide the original fat.bin to extract the overlay offsets.
WARNING: DO NOT MODIFY FAT FILES NAMES OR EXTENSIONS, OR YOU WILL NEED A NEW fnt.bin. WARNING: DO NOT MODIFY FAT FILES NAMES OR EXTENSIONS, OR YOU WILL NEED A NEW fnt.bin.
* patch the FAT section (fat.bin): this is only necessary if the FAT files' final address (fat_data.bin) differs from the original. * patch the FAT section (fat.bin): this is only necessary if the FAT files' final address (fat_data.bin) differs from the original.
Patching the FAT is straightforward: load your fat.bin, and fill in the original and new addresses of fat_data.bin. This will produce a patched fat.bin for use in the packing process. Patching the FAT is straightforward: load your fat.bin, and fill in the original and new addresses of fat_data.bin. This will produce a patched fat.bin for use in the packing process.
@ -61,6 +60,5 @@ In this tab, you can:
If you find a bug, feel free to open an issue or submit a pull request :) If you find a bug, feel free to open an issue or submit a pull request :)
Special thanks to [Antonio Barba](https://github.com/antoniobarba) & [Davide Trogu](https://github.com/Dax89) ## Developed with ❤ by Luca D'Amico
## Special thanks to Antonio Barba & Davide Trogu
Developed with ❤ by Luca D'Amico

View File

@ -42,7 +42,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>NDSFactory V1.3.2</string> <string>NDSFactory V1.3.1</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set> <set>Qt::AlignmentFlag::AlignCenter</set>
@ -58,7 +58,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>(C) 2019-2025 - Luca D'Amico</string> <string>(C) 2019-2024 - Luca D'Amico</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set> <set>Qt::AlignmentFlag::AlignCenter</set>